Jonathan Kolyer
|
d1968adfc7
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-06 06:37:11 -06:00 |
Jonathon Wilson
|
76d82f7d01
|
Fixes for cucumber tests. Restore big chunk of accidentally deleted layout.js
|
2013-01-12 12:19:20 -07:00 |
|
Jonathon Wilson
|
f95f30d827
|
FTUE, screens 2 and 3
|
2013-01-12 11:19:02 -07:00 |
|
Jonathon Wilson
|
57c4078be3
|
Revisions to FTUE screen 1
|
2013-01-12 11:19:02 -07:00 |
Brian Smith
|
b6609eb39c
|
fixed friend bug
|
2013-01-10 22:42:26 -05:00 |
 Seth Call
|
0940175f88
|
* oops; forgot to add DEB_SERVER decl
|
2013-01-06 20:31:31 -06:00 |
|
Seth Call
|
3c2e1b17de
|
* publish deb for jam-web after jenkins build
|
2013-01-06 20:03:14 -06:00 |
|
Brian Smith
|
b5a031592e
|
VRFS-80 session history
|
2013-01-06 15:47:56 -05:00 |
|
Jonathon Wilson
|
fd57f3f01e
|
Finish FTUE functional, but bugs in bridge prevent test. Checking in to let Nat see test code. Re-include TestLatency on fakeJamClient to fix failing test.
|
2013-01-06 13:34:48 -07:00 |
|
Jonathan Kolyer
|
4eea9e4313
|
added auto-population of users location data from the confirmation signup link using the remote-ip
|
2013-01-06 06:36:55 -06:00 |
|
Jonathan Kolyer
|
ffd6d8425d
|
added jonathan@jamkazam as dev_user
|
2013-01-06 06:35:57 -06:00 |
|
Seth Call
|
914bc7302f
|
VRFS-188: switch from blacklist to whitelisting
|
2013-01-05 08:12:23 -06:00 |
|
Seth Call
|
52cf087321
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-05 05:06:15 -06:00 |
|
Jonathon Wilson
|
1228e0547e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-05 14:36:20 -07:00 |
|
Jonathon Wilson
|
b195aa8991
|
re-add home link for cucumber test to FTUE3
|
2013-01-05 14:34:12 -07:00 |
|
Jonathon Wilson
|
9d79aeede2
|
FTUE device selection dropdowns and enable. Flesh out fakeJamClient
|
2013-01-05 14:30:24 -07:00 |
|
Seth Call
|
e7a9c1cfbc
|
* VRFS-188; left a bit of extra text in the adduser command
|
2013-01-05 05:04:58 -06:00 |
|
Seth Call
|
1e9d26432a
|
* VRFS-188 done for now. type sudo start jam-web or sudo stop jam-web to start/stop on ubuntu
|
2013-01-04 22:00:47 -06:00 |
|
Seth Call
|
aabf2d6dd1
|
* make websocket_gateway_uri in javascript be host-bound in development, config bound in other modes
|
2013-01-04 09:05:26 -06:00 |
|
Seth Call
|
8c7a7764fb
|
* forcing javascript to use websocket_gateway_uri from configuration. I think this may revert something else we did, but fixe.s the test
|
2013-01-04 08:25:12 -06:00 |
|
Seth Call
|
01277a0cfd
|
* moving cucumber's websocket-gateway port off of 6767 to avoid conflicts with a running 'normal' websocket-gateway
|
2013-01-03 00:05:40 -06:00 |
|
Seth Call
|
eea7ba0488
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-02 23:15:53 -06:00 |
|
Seth Call
|
b603366821
|
* VRFS-188 settling on unicorn.
|
2013-01-02 23:15:42 -06:00 |
|
Jonathon Wilson
|
2361223148
|
Sidebar: start to Jeff's notifications
|
2013-01-02 09:06:23 -07:00 |
|
Jonathon Wilson
|
68cd2ab63a
|
Start of chart from Jeff
|
2013-01-02 08:52:28 -07:00 |
|
Jonathon Wilson
|
d254c26010
|
Sidebar: Add friends count and style
|
2013-01-02 07:59:16 -07:00 |
|
Jonathon Wilson
|
9c30e17206
|
Start on sidebar from Jeff
|
2012-12-31 14:02:18 -07:00 |
|
Jonathon Wilson
|
9a6d15280b
|
Changes for updated GetASIODevices with no callback
|
2012-12-31 14:02:18 -07:00 |
|
Seth Call
|
dbdc88a5d2
|
* VRFS-188; settling on not embedding websocket-gateway inside of rails when in production due to passenger
|
2012-12-31 12:45:11 -06:00 |
|
Seth Call
|
1f516eef0b
|
* VRFS-188; production mode working with passenger phusion
|
2012-12-31 05:58:34 -06:00 |
|
Seth Call
|
d491025e3b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-30 20:25:35 -06:00 |
|
Seth Call
|
ad9644b19e
|
*VRFS-188; package is built if you specify PACKAGE=1 as an env var when building
|
2012-12-30 20:25:24 -06:00 |
|
Brian Smith
|
964e7bbd1c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-30 09:40:54 -05:00 |
|
Brian Smith
|
946cf7c8d0
|
VRFS-159 fixed bugs / added unit tests
|
2012-12-30 09:39:59 -05:00 |
|
Seth Call
|
6968f22f8c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-29 10:12:48 -06:00 |
|
Seth Call
|
e2cb402704
|
* VRFS-188 in progress
|
2012-12-29 10:12:05 -06:00 |
|
Brian Smith
|
a4b8421609
|
fix unit test
|
2012-12-29 09:32:13 -05:00 |
|
Brian Smith
|
a60fb64512
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-29 09:30:10 -05:00 |
|
Brian Smith
|
dec0aa7e52
|
VRFS-159 block, spam, ignore friend requests / unit tests
|
2012-12-29 09:29:20 -05:00 |
|
Seth Call
|
c576bada56
|
* fake commit to test bitbucket integration with jenkins
|
2012-12-28 14:15:12 -06:00 |
Mike Slemmer
|
8ce22c153d
|
Completing password reset
|
2012-12-27 23:31:12 -08:00 |
|
Mike Slemmer
|
bec5bb4729
|
fix tests
|
2012-12-21 22:32:24 -08:00 |
|
Mike Slemmer
|
eed2ae8a1f
|
reset password work
|
2012-12-21 16:56:49 -08:00 |
|
Brian Smith
|
ba120d40e9
|
refactor
|
2012-12-17 01:58:50 -05:00 |
|
Brian Smith
|
4f5c8df2bf
|
VRFS-174 - added resource to retrieve bands for a specific user
|
2012-12-17 01:24:23 -05:00 |
|
Brian Smith
|
b4b6ee190e
|
VRFS-120 - completed Likes for Users and Bands
|
2012-12-17 01:02:09 -05:00 |
|
Brian Smith
|
009d538ede
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-12-16 18:24:39 -05:00 |
|
Brian Smith
|
e7f46015d0
|
VRFS-120 - Likes module
|
2012-12-16 18:24:35 -05:00 |
|
Jonathon Wilson
|
5932be249a
|
Add FTUE screens to create Session cucumber feature
|
2012-12-16 15:52:17 -07:00 |
|
Mike Slemmer
|
ef6b0d5ef1
|
merge
|
2012-12-16 12:40:31 -08:00 |