Brian Smith
|
c849ae0536
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-21 14:50:41 -05:00 |
|
Brian Smith
|
d3ddf3b114
|
VRFS-81 - recording/favorite development
|
2012-11-21 14:49:00 -05:00 |
Mike Slemmer
|
b9ae0e0b5f
|
added spec tests
|
2012-11-20 01:48:48 -08:00 |
|
Brian Smith
|
98c6ad0bb0
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-18 16:52:26 -05:00 |
|
Brian Smith
|
647ff68c83
|
VRFS-81 more favorites development
|
2012-11-18 16:52:22 -05:00 |
 Seth Call
|
ea0e587d51
|
* redirect errors to dev/null of xvfb; second attempt
|
2012-11-18 12:35:57 -06:00 |
|
Seth Call
|
d66b53e462
|
* a little better comments in jasmine code and suppress constant error
|
2012-11-18 12:31:56 -06:00 |
|
Seth Call
|
6ba0f9cc2b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-18 11:33:35 -06:00 |
|
Seth Call
|
4f922a8a48
|
* run xvfb and encourage jasmine to use it
|
2012-11-18 11:33:09 -06:00 |
Jonathon Wilson
|
6f71a80017
|
Fix tests related to different root_url
|
2012-11-18 11:27:20 -06:00 |
|
Jonathon Wilson
|
2c8fb48e53
|
Initial version of landing page and support for non-logged-in client home.
|
2012-11-18 10:52:04 -06:00 |
|
Seth Call
|
1099720911
|
* checking error codes of tests better and cleade up lecho logs
|
2012-11-18 09:21:01 -06:00 |
|
Seth Call
|
0d89bed9d1
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-18 09:10:15 -06:00 |
|
Seth Call
|
d603d35c2d
|
* running jasmine differently for build server
|
2012-11-18 09:09:36 -06:00 |
|
Mike Slemmer
|
e3b647e4fa
|
missing image
|
2012-11-18 01:07:54 -08:00 |
|
Seth Call
|
fded893402
|
* require jam_ruby at top of spec_helper.rb
|
2012-11-18 02:03:12 -06:00 |
|
Seth Call
|
dc09f0f36b
|
* jam-web getting ready to build tests
|
2012-11-18 01:56:50 -06:00 |
|
Brian Smith
|
3a78928b4f
|
added unit test for updating user attributes
|
2012-11-18 02:00:06 -05:00 |
|
Brian Smith
|
4a0db8e97a
|
merge
|
2012-11-17 23:05:08 -05:00 |
|
Brian Smith
|
205380d91e
|
more test cleanup
|
2012-11-17 22:56:23 -05:00 |
|
Seth Call
|
e27083e45c
|
* VRFS-100 completed
|
2012-11-17 21:41:26 -06:00 |
|
Brian Smith
|
abac3cab38
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-17 21:49:10 -05:00 |
|
Seth Call
|
b941a68a9c
|
* more config-based testing
|
2012-11-17 20:37:36 -06:00 |
|
Seth Call
|
2e61b2ba00
|
* making jam-web's test use the database.yml's test configs for connection info, not defaults (which is unix domain socket)
|
2012-11-17 20:32:29 -06:00 |
|
Brian Smith
|
e41b3a2417
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-16 22:14:38 -05:00 |
|
Seth Call
|
8b65f6063f
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-15 20:59:36 -06:00 |
|
Seth Call
|
ab3bb5f51e
|
* VRFS-92 add music session stub params
|
2012-11-15 20:50:48 -06:00 |
|
Brian Smith
|
9f7f19c7c2
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-15 21:10:40 -05:00 |
|
Brian Smith
|
1547fb42cb
|
VRFS-81 recordings and favorites
|
2012-11-15 21:10:35 -05:00 |
|
Mike Slemmer
|
96c16eb1e5
|
now oauth is working
|
2012-11-15 01:30:30 -08:00 |
|
Mike Slemmer
|
b4f0d3b9eb
|
another set of oauth work
|
2012-11-15 00:47:19 -08:00 |
|
Mike Slemmer
|
6b520b0a2b
|
facebook integration work
|
2012-11-14 22:18:37 -08:00 |
|
Brian Smith
|
dd63b8e5ad
|
VRFS-89, VRFS-90 remove name from user model
|
2012-11-14 22:24:42 -05:00 |
|
Seth Call
|
ea7f9339a4
|
* trying out the login/logout as singleton pats
|
2012-11-14 00:08:32 -06:00 |
|
Seth Call
|
0d3334a3b0
|
* VRFS-88 api/login done
|
2012-11-13 23:57:10 -06:00 |
|
Seth Call
|
2d856351d7
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-13 23:37:56 -06:00 |
|
Seth Call
|
bd41e615cf
|
* VRFS-88; login/logout APIs done
|
2012-11-13 23:37:50 -06:00 |
Jonathon Wilson
|
2fb617cab7
|
Search. (VRFS-75)
|
2012-11-12 21:16:43 -07:00 |
|
Seth Call
|
4b392f8cde
|
*show.rabl resolved
|
2012-11-12 21:14:23 -06:00 |
|
Brian Smith
|
5f3ed69c8e
|
add account fields
|
2012-11-12 21:52:30 -05:00 |
|
Mike Slemmer
|
c8f84918d4
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-12 12:12:37 -08:00 |
|
Mike Slemmer
|
049e9b7066
|
Omniauth routes
|
2012-11-12 12:12:32 -08:00 |
|
Seth Call
|
a179e5b0f0
|
* VRFS-72 merged
|
2012-11-12 07:26:13 -06:00 |
|
Seth Call
|
00bd6e4569
|
* VRFS-72 complete
|
2012-11-12 07:20:38 -06:00 |
|
Seth Call
|
f624b4e32f
|
* VRFS-72 complete
|
2012-11-12 06:59:43 -06:00 |
|
Jonathon Wilson
|
1239cad08f
|
Good chunk of user profile (VRFS-74)
|
2012-11-11 13:52:47 -07:00 |
|
Brian Smith
|
3fc3c57e20
|
added name back to avoid breaking
|
2012-11-10 23:35:56 -05:00 |
|
Brian Smith
|
fc1a5c46f1
|
roll back
|
2012-11-10 23:26:13 -05:00 |
|
Brian Smith
|
f5db91c695
|
added first and last name fields
|
2012-11-10 23:25:28 -05:00 |
|
Brian Smith
|
bbaa18ba67
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-11-10 08:26:13 -05:00 |