seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
6,720 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

76 Commits

Author SHA1 Message Date
Seth Call ec0b203177 carrierwave pin 2017-01-06 06:44:02 -06:00
Seth Call 458637b1de VRFS-3993 - better nav/help on jamtrack player 2016-12-06 08:01:10 -06:00
Seth Call 79f6649602 fix bad asset compile 2016-12-05 10:25:37 -06:00
Seth Call 88f796faed activeadmin set to real build 2016-07-17 22:23:07 -05:00
Seth Call 510d157262 * upgrade to Rails 4 as well as support JjamBlaster 2016-07-17 10:16:27 -05:00
Seth Call 17322eab1d cohort reportin 2016-06-09 13:23:32 -05:00
Seth Call 4abc2f81ff Remove influxdb dependency from other projects 2016-04-27 05:46:35 -05:00
Seth Call c7ca2ca974 Remove guard 2016-04-25 09:27:49 -05:00
Seth Call e07bc21d2a * cause dependency added 2016-04-13 12:38:32 -05:00
Seth Call 9e4105a391 * VRFS-4004 and VRFS-4005 - student/teacher welcome emails 2016-04-06 13:01:40 -05:00
Seth Call 399d010310 * lessons 90% done, but still mostly hidden 2016-04-05 21:23:15 -05:00
Seth Call 20e5650baa * add ruby gemfile deps to admni 2016-01-04 16:15:07 -06:00
Seth Call 86b7327eca * unpin fog 2015-11-18 20:06:30 -06:00
Seth Call 55c1d2fb41 * trying to fix transition to 2.2.2 2015-07-16 11:48:17 -05:00
Seth Call efe3dea8e3 * updating Rails to 3.2.22 to allow compat with ruby 2.2.2 2015-07-16 10:58:03 -05:00
Seth Call 3b71931e73 merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Seth Call 5269520924 * fix bug in earliest cohort code 2015-03-17 10:36:41 -05:00
Jonathan Kolyer 5ee4784417 VRFS-2916 admin index 2015-03-17 01:34:04 +00:00
Steven Miers e662c95fba VRFS-2785 : Add Jam Track Right (purchased jam track) to admin ui. Hook up a refund action. 2015-02-19 16:41:09 -06:00
Seth Call b89e6e9475 * VRFS-2748, VRFS-2749 - update styling for / page and home page 2015-02-06 22:04:37 -06:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -06:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Seth Call ce8c218054 * pinning devise in adming 2014-10-08 09:29:45 -05:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Seth Call 8a4038e7ce * pinning capybara-screenshot; it just released a breaking version (1.0.0) 2014-09-17 20:57:49 -05:00
Seth Call 5f85908c79 * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
Seth Call 591432d9d2 * adding sanitize gem to admin 2014-08-19 14:24:50 -05:00
Seth Call 50c611d729 * removing debugger gem from admin gemfile for now 2014-07-28 09:49:56 -05:00
Seth Call 433148cd55 * adding rubyzip to websocket-gateway and admin 2014-07-19 23:05:20 -05:00
Seth Call eecc402744 * pin faker to 1.3.0 2014-07-03 20:52:36 -05:00
Seth Call 5b8fd14088 * pin jquery-ui-rails to 4.2.1 2014-07-03 20:39:26 -05:00
Seth Call ec6c4d010c * fix Gemfile in admin-web 2014-06-24 11:33:56 -05:00
Seth Call 84f1e79223 * pin admin tests 2014-06-03 17:45:48 -05:00
Anthony Davis 1ce510bb18 VRFS-1705 - 'monitor' subproj initial commit 2014-05-21 16:52:11 -05:00
Bert Owen 6ecb7abcad VRFS-1654 issue fixed without test 2014-05-09 23:50:50 +08:00
developer 8f06168f1c VRFS-1654 - configure feed layout 2014-05-08 23:18:57 +08:00
Seth Call 4e9c2377ba * fix broken pages in admin 2014-05-08 08:04:06 -05:00
Seth Call 57e8860dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 14:22:56 -05:00
Anthony Davis 4d4d04b343 VRFS-1651 - test-www should not use build_number 2014-05-07 08:30:41 -05:00
Seth Call 97269133ba Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 08:03:43 -05:00
Anthony Davis 1fa9ffcc3f VRFS-1651 - really no jam_* gems in test-www 2014-05-07 07:40:22 -05:00
Anthony Davis fb1d634875 VRFS-1651 - jam_ gem version does not matter for test_www 2014-05-07 07:33:33 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Seth Call 00a6139cd1 * merged 2014-04-29 14:04:26 +00:00
Jonathan Kolyer a7d83064df VRFS-1576 fixing redirect paths to use active_admin_template 2014-04-23 06:39:49 +00:00
Seth Call 76e63193ca * fixing some broken tests 2014-04-09 21:11:13 +00:00
Jonathan Kolyer e59d9cbe7a VRFS-1483 email error handling 2014-04-05 18:52:12 +00:00
Jonathan Kolyer 0987cf2cf8 VRFS-1483 editing batch emails 2014-03-19 16:37:03 +00:00
Daniel Weigh ca64966c7f * duplicate entry 
$ bundle exec rails server
Your Gemfile lists the gem bcrypt-ruby (= 3.0.1) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the
version of just one of them later.
 2014-02-20 00:30:25 -05:00