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

288 Commits

Author SHA1 Message Date
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
Mike Slemmer 090a81ce8c work on updating music sessions plus testing create and update 2012-12-16 12:26:29 -08:00
Jonathon Wilson dff47dae00 Merge branch 'vrfs-173_ftue' 2012-12-16 12:30:09 -07:00
Jonathon Wilson ba0111be60 Add GetASIOAudioDevices to testBridge page. Update other nav headers. 2012-12-16 12:28:10 -07:00
Brian Smith d411ff14d6 track updates 2012-12-16 10:53:48 -05:00
Brian Smith cd3883b13c fixed bug with track creation / added unit test 2012-12-16 08:25:38 -05:00
Jonathon Wilson 449de26da0 Default to FTUE for now. Enable back/forward nav buttons. 2012-12-15 14:00:02 -07:00
Mike Slemmer 6768472528 regions and cities requests plus tests 2012-12-15 12:17:41 -08:00
Brian Smith cf9c21148e Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-12-15 02:12:17 -05:00
Brian Smith 3d2bfe5f4f VRFS-157 track API development 2012-12-15 02:10:42 -05: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
Jonathon Wilson 16c0421464 Starts for FTUE screens. Bring in beginnings of screen navigation/header. 2012-12-14 09:58:03 -07: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