..
app
VRFS-3336 : Fix final save button on edit account profile.
2015-07-15 17:05:11 -05:00
config
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
db
Merge with develop.
2015-06-03 14:22:21 -05:00
doc
merging jam-web into web
2013-09-15 18:04:37 +00:00
features
merging jam-web into web
2013-09-15 18:04:37 +00:00
lib
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
log
merging jam-web into web
2013-09-15 18:04:37 +00:00
public
Merge with develop.
2015-06-03 14:22:21 -05:00
script
* wip
2014-07-14 15:53:04 -05:00
spec
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
test
merging jam-web into web
2013-09-15 18:04:37 +00:00
vendor
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
.gitignore
* ignore jt_metadata.json file
2015-04-22 15:48:57 -05:00
.rspec
* adding rspec config
2014-07-19 21:39:43 -05:00
.ruby-gemset
merging jam-web into web
2013-09-15 18:04:37 +00:00
.ruby-version
fix warning related to ruby- prefix in .ruby-version files
2013-12-27 16:28:28 -05:00
.simplecov
VRFS-1103 - ruby coverage is now logged during web tests
2014-05-31 20:38:39 -05:00
Gemfile
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
Guardfile
merging jam-web into web
2013-09-15 18:04:37 +00:00
ORIG_LICENSE
merging jam-web into web
2013-09-15 18:04:37 +00:00
README.md
Merge with develop.
2015-06-03 14:22:21 -05:00
Rakefile
Merge and fix
2015-04-16 12:16:09 -05:00
bower.json
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
build
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
config.ru
merging jam-web into web
2013-09-15 18:04:37 +00:00
jenkins
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
loop.bash
Merge with develop.
2015-06-03 14:22:21 -05:00
migrate.sh
merging jam-web into web
2013-09-15 18:04:37 +00:00
package.json
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
ruby-bt.txt
Merge with develop.
2015-06-03 14:22:21 -05:00