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

1701 Commits

Author SHA1 Message Date
Seth Call dc3fd38af1 * adding bart to dev_users 2014-07-26 14:19:48 -05:00
Seth Call c13bbb95c0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-25 15:01:26 -05:00
Seth Call adb0b15555 * fixing bad schedules on scheduler.yml, and wip on admin web reporting 2014-07-25 15:01:14 -05:00
Bert Owen b09551548d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-25 13:50:17 +02:00
Bert Owen c4f0472438 VRFS-1940 fix, test fix 2014-07-25 13:50:00 +02:00
Seth Call 6a037d9987 * VRFS-1944 - user info added to scores and score_histories 2014-07-24 18:39:26 -05:00
Bert Owen 60d7013d42 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-25 00:05:40 +02:00
Bert Owen c966ffb8f9 VRFS-1940 fix default duration 2014-07-25 00:05:21 +02:00
Seth Call 5080458914 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-24 15:56:37 -05:00
Seth Call cafb216136 * false commit to poke jenkins 2014-07-24 15:56:16 -05:00
Bert Owen f38896837b VRFS-1940 start time/end time enhancement 2014-07-24 19:03:39 +02:00
Seth Call d73cc3af2c * VRFS-1871 and VRFS-1903 are both results of easydropdown dying if it has a select with no options. So I default an empty select to 1 option with content N/A 2014-07-23 22:50:15 -05:00
Seth Call 1ca709d945 * make sure URL doesn't change if you hit cancel in notification 2014-07-23 22:26:54 -05:00
Seth Call 04b71506b4 * VRFS-1896 - check client side and server side if client size is uploaded 2014-07-23 22:14:55 -05:00
Seth Call 27e6f7ce65 * fixing scoring test 2014-07-23 21:27:21 -05:00
Seth Call 2dda0d6db7 * false commit to poke Jenkins 2014-07-23 21:11:06 -05:00
Seth Call 1b01fc0a0d * false commit to poke jenkins 2014-07-23 19:13:42 -05:00
Seth Call 5833da2618 * fixing test; marking one as pending while i work on it 2014-07-23 18:26:28 -05:00
Seth Call b590548af5 * VRFS-1937 - centered text now left aligned on cerate session screen for scheduled sessions 2014-07-23 16:30:42 -05:00
Seth Call 3894b2cbd3 * VRFS-1916 - fix vertical alignment issues on find session page 2014-07-23 15:40:25 -05:00
Seth Call cc6f3fe974 * VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page 2014-07-23 15:11:02 -05:00
Seth Call ce3ae06053 * VRFS-1935 - show sessions regardless if native or browser 2014-07-23 11:38:31 -05:00
Seth Call fc57fd7011 * VRFS-1868 - bring back P2P messages in the app 2014-07-23 11:15:14 -05:00
Seth Call 333e321877 * updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc) 2014-07-22 14:36:45 -05:00
Seth Call 57728fbfe8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-21 16:42:36 -05:00
Seth Call 6c4bcd98be * VRFS-1924 - score_history added 2014-07-21 16:42:30 -05:00
Brian Smith e22f3f32df remove log statement 2014-07-21 01:54:06 -04:00
Brian Smith 1d96f1b981 VRFS-1608 remove check that bypasses call to changeScreen if the user is already on the screen with the same internal name 2014-07-21 01:53:20 -04:00
Brian Smith 838a3d4d13 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-21 01:37:09 -04:00
Brian Smith 08d8d86fc6 VRFS-1635 auto-select the FB checkbox after successfully signing in to Facebook 2014-07-21 01:36:57 -04:00
Jonathan Kolyer ecf4b6f397 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-21 05:14:11 +00:00
Jonathan Kolyer b4ab41637c VRFS-1629 added UserAuthorization.goog_auth method to exclude auths past expiration 2014-07-21 05:14:05 +00:00
Brian Smith 4aa359fc13 VRFS-1921 legal policy links are now specific to environment, fixed bug with legal policy link on Session Info page 2014-07-21 01:05:07 -04:00
Brian Smith c8162f55ca VRFS-1916 minor changes 2014-07-21 00:33:20 -04:00
Seth Call 00ab39d82b * speeding up web tests 2014-07-19 22:53:33 -05:00
Seth Call 081d0ab0dc * adding zip to gem 2014-07-19 21:58:57 -05:00
Seth Call 1e0e78c520 * adding rspec config 2014-07-19 21:39:43 -05:00
Seth Call 513a46067a * merged 2014-07-19 21:12:11 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Brian Smith 32a16c4dcb fix test 2014-07-16 20:30:33 -04:00
Bert Owen 5027000c49 VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP 2014-07-16 20:19:43 +02:00
Bert Owen 662b668d87 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-16 18:21:37 +02:00
Bert Owen 590e6d8028 VRFS-1926 fixed, fix scheduled session query 2014-07-16 18:21:21 +02:00
Brian Smith 8f62216dbe Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-16 01:21:12 -04:00
Brian Smith 7555d8b65a VRFS-1892 refresh only the affected session row when updating RSVPs 2014-07-16 01:20:59 -04:00
Bert Owen db06226cd9 VRFS-1923 Implement spinner when fetching scheduled sessions on create session screen 2014-07-15 00:34:36 +02:00
Seth Call c2a5936720 * wip 2014-07-14 15:53:04 -05:00
Bert Owen 9209a8f8ac VRFS-1918 Session Details Update Screen - once over with tests 2014-07-14 20:40:19 +02:00
Bert Owen 26f7d2755b VRFS-1918 Session Details Update Screen - once over with tests 2014-07-14 20:40:00 +02:00
Brian Smith 34a6843616 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-13 22:02:59 -04:00