seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,883 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

7883 Commits

Author SHA1 Message Date
Brian Smith 3d2bfe5f4f VRFS-157 track API development 2012-12-15 02:10:42 -05:00
Brian Smith 9357d3f03a VRFS-157 track API development 2012-12-15 02:10:01 -05:00
Mike Slemmer de941eaef1 duh 2012-12-14 21:51:59 -08:00
Seth Call 6e30ef81d1 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-14 21:37:07 -06:00
Seth Call 5aa85eb408 * VRFS-17; now having other join session 2012-12-14 21:36:53 -06:00
Seth Call e7def85594 * VRFS-17; can create a session, find the other; not joining yet 2012-12-14 21:22:00 -06:00
Mike Slemmer 2a63593726 Merge branch 'master' into slemmer_20121211 2012-12-14 12:31:21 -08:00
Mike Slemmer 9a063cfc85 Merge branch 'slemmer-121211' into slemmer_20121211 2012-12-14 12:29:29 -08:00
Mike Slemmer a32f0d240b add email templates 2012-12-14 12:22:15 -08:00
Jonathon Wilson 16c0421464 Starts for FTUE screens. Bring in beginnings of screen navigation/header. 2012-12-14 09:58:03 -07:00
Mike Slemmer 59e6d82ef3 send email 2012-12-14 01:16:54 -08:00
Mike Slemmer 81ebd4aa99 fixed test 2012-12-14 01:07:14 -08:00
Seth Call dde4bd0f1e Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-13 21:59:22 -06:00
Seth Call 26e71918d4 * VRFS-171 work in progress 2012-12-13 21:59:10 -06:00
Mike Slemmer 8428ca36d2 set_password and some refactoring 2012-12-13 19:32:51 -08:00
Mike Slemmer 0a4e41e5d1 set_password plus some refactoring 2012-12-13 19:32:23 -08:00
Mike Slemmer 7ff103a430 more work 2012-12-13 09:15:47 -08:00
Jonathon Wilson b3acb39de4 Helpers for client testing and Fixes to Find Session with latency pinging. 2012-12-12 21:53:15 -07:00
Seth Call a568fff53e * remove 'headless' gem dependency until it becomes a problem in the way it's done atm on jenkins 2012-12-11 23:47:28 -06:00
Seth Call 1560d0f000 * specifying display=99 in cucumber to leverage xvfb 2012-12-11 23:43:25 -06:00
Seth Call 975e549a1a * adding initial cucumber test to build script 2012-12-11 23:38:35 -06:00
Seth Call 3be2080aeb Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-11 23:34:10 -06:00
Seth Call a6768e406a * a simple cucumber test - just verifies home page is responsive 2012-12-11 23:33:06 -06:00
Seth Call 4973f4ac8f * a simple cucumber test - just verifies home page is responsive 2012-12-11 23:32:53 -06:00
Mike Slemmer c068f2ca16 work 2012-12-11 14:59:37 -08:00
Mike Slemmer a6ebbb3c7e work 2012-12-11 14:59:09 -08:00
Mike Slemmer 8d7ec6d9e7 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-11 13:41:24 -08:00
Jonathon Wilson 4f84181dae Revert logo back to h1 with CSS image replacement 2012-12-11 10:26:16 -07:00
Jonathon Wilson 19a065274e Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-11 09:56:07 -07:00
Jonathon Wilson 290b9b654e Bring Jeff's graphics in: Header 2012-12-11 09:49:15 -07:00
Seth Call a3e9dd1422 * making websocket-gateway embedded only active in dev mode 2012-12-10 23:34:00 -06:00
Seth Call afc10e539f *VRFS-169 completed; embedding websocket-gateway 2012-12-10 23:14:47 -06:00
Seth Call 5d3a7006ea * merged 2012-12-10 19:52:22 -06:00
Seth Call 8e331aaf00 * forget GEM_SERVER var 2012-12-10 07:35:08 -06:00
Seth Call fb0ffd151f * VRFS-168; making a gem out of websocket-gateway 2012-12-10 07:30:45 -06:00
Brian Smith ff6a5f2ff3 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-10 00:53:54 -05:00
Brian Smith 5e87d00732 VRFS-33 - save invitation receivers as part of session settings 2012-12-10 00:53:21 -05:00
Brian Smith d1903ccef4 VRFS-33 - save invitation receivers as part of session settings 2012-12-10 00:52:57 -05:00
Jonathon Wilson ffbb1e0040 Add legal_terms:true to testBridge create session 2012-12-09 21:55:29 -07:00
Seth Call 46789b453e * adding legal_terms boolean to factory for VRFS-37 2012-12-09 20:59:50 -06:00
Seth Call eb333d962e * VRFS-37 done; legal_terms=true is required in create session 2012-12-09 16:11:38 -06:00
Seth Call 990e4c1a0d * require 'legal_terms' boolean = true on create session 2012-12-09 16:11:01 -06:00
Seth Call b89bb9e597 * VRFS-149; making feature configurable 2012-12-09 15:09:48 -06:00
Seth Call 2889ad739c * VRFS-149 2012-12-09 15:00:28 -06:00
Seth Call 7e1b1a8977 * merged 2012-12-09 14:59:11 -06:00
Seth Call 29e68191a4 * VRFS-149; create dev users if in development mode 2012-12-09 14:58:02 -06:00
Seth Call af8bee6084 * VRFS-149; bootstrap dev users 2012-12-09 14:56:35 -06:00
Brian Smith e0bbbbea35 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-08 23:06:37 -05:00
Brian Smith 21f09ecd69 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-12-08 23:06:07 -05:00
Brian Smith 7a345f2163 VRFS-33 added session settings 2012-12-08 23:05:54 -05:00