Mike Slemmer
|
6d9f755a24
|
update
|
2013-05-13 16:17:23 -07:00 |
Brian Smith
|
4bc8491231
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-13 18:35:40 -04:00 |
|
Brian Smith
|
afba76beaa
|
VRFS-292 configure tracks dialog work
|
2013-05-13 18:35:14 -04:00 |
|
Mike Slemmer
|
101582c6bd
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web into slemmerwork
|
2013-05-13 13:56:53 -07:00 |
 Seth Call
|
c39bca968d
|
t Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-13 14:34:10 -05:00 |
|
Seth Call
|
244695f5c0
|
* VRFS-311; you can update your email end-to-end; there are some styling changes pending (waiting on feedback from designer)
|
2013-05-13 14:34:03 -05:00 |
|
Seth Call
|
5f31daccd1
|
* VRFS-311; reject users that try to set their email to the same email as it currently is
|
2013-05-12 22:27:12 -05:00 |
|
Brian Smith
|
8561c0ceca
|
VRFS-292 more Configure Tracks work
|
2013-05-12 07:00:57 -04:00 |
|
Brian Smith
|
17bb5a29bf
|
VRFS-292 Configure Tracks dialog work
|
2013-05-12 01:43:36 -04:00 |
|
Seth Call
|
808d8f6321
|
* VRFS-311 account page is styled, and, where possible so far, populated from the /api/users/:id API
|
2013-05-11 19:28:48 -05:00 |
|
Mike Slemmer
|
84ce232fa5
|
added files
|
2013-05-10 23:06:12 -07:00 |
Mike Slemmer
|
1fd61f8eca
|
More work
|
2013-05-10 22:48:22 -07:00 |
|
Seth Call
|
8c4db61eed
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-05-10 11:38:57 -05:00 |
|
Seth Call
|
5e0ff97e71
|
* VRFS-311 REST APIs in place
|
2013-05-10 11:38:50 -05:00 |
|
Seth Call
|
2dfdf8463c
|
* VRFS-311 - emailing and user model business logic done
|
2013-05-10 07:10:33 -05:00 |
|
Seth Call
|
476829e61d
|
* VRFS-311 - database new columns on user model to hold desired new email as well as email token
|
2013-05-10 07:09:26 -05:00 |
|
Brian Smith
|
e63e8b9671
|
VRFS-291 add Add Track dialog to layout
|
2013-05-07 23:14:33 -04:00 |
|
Seth Call
|
9d2ebe67cd
|
erge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-05-07 11:54:14 -05:00 |
|
Seth Call
|
d51feece12
|
* removing check for protected method (due to switch to ruby 2.0.0)
|
2013-05-07 11:52:31 -05:00 |
|
Mike Slemmer
|
d3aa419b60
|
big recording push
|
2013-05-06 16:47:20 -07:00 |
|
Mike Slemmer
|
c41c5d3b74
|
more recordings
|
2013-05-06 16:11:14 -07:00 |
|
Seth Call
|
4828df0dfc
|
* bumping pg_migrate to support ruby2.0
|
2013-05-06 15:13:03 -05:00 |
|
Seth Call
|
271acd1a2b
|
* perf-data upload
|
2013-05-05 19:18:24 -05:00 |
|
Seth Call
|
5e64e6a7a2
|
* perf-data upload fixes
|
2013-05-05 19:17:16 -05:00 |
|
Brian Smith
|
107b4ec007
|
fix tests
|
2013-04-28 22:22:41 -04:00 |
|
Brian Smith
|
87564c442b
|
fix tests
|
2013-04-28 22:21:16 -04:00 |
|
Brian Smith
|
e7b581b42c
|
fix profile URLs
|
2013-04-28 15:09:30 -04:00 |
|
Brian Smith
|
2979ccdb62
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-28 15:06:56 -04:00 |
|
Brian Smith
|
72cdd1b4d7
|
VRFS-305 musician profile bands tab
|
2013-04-28 15:06:17 -04:00 |
|
Brian Smith
|
1acba9dee6
|
VRFS-305 musician profile bands tab
|
2013-04-28 15:06:01 -04:00 |
|
Seth Call
|
50e2982150
|
* up the wait before we start update
|
2013-04-27 12:39:19 -05:00 |
|
Seth Call
|
56fc60a811
|
* make it so the UI always updates before starting teh restart process
|
2013-04-27 12:18:20 -05:00 |
|
Seth Call
|
42984e1e18
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-27 10:55:31 -05:00 |
|
Seth Call
|
6e21e02078
|
* remove confusing line of jvs
|
2013-04-27 10:55:24 -05:00 |
|
Brian Smith
|
c5e0371250
|
fix test
|
2013-04-26 23:41:53 -04:00 |
|
Brian Smith
|
3cb28274c0
|
VRFS-306 musician profile social tab
|
2013-04-26 23:33:52 -04:00 |
|
Brian Smith
|
10a8296ae5
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-26 23:32:54 -04:00 |
|
Brian Smith
|
00578afc49
|
VRFS-306 bug fixes to support followers/followings
|
2013-04-26 23:24:13 -04:00 |
|
Seth Call
|
77f400972e
|
* stripping extra quotes from client version, if found
|
2013-04-25 23:30:32 -05:00 |
|
Seth Call
|
69a54baec4
|
* adding what version is reported by backend to javascrpt log
|
2013-04-25 20:25:47 -05:00 |
|
Brian Smith
|
5068196fb4
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-25 21:10:52 -04:00 |
|
Seth Call
|
fee330abdb
|
* oops. I turned off websocket gateway in development
|
2013-04-25 20:09:03 -05:00 |
|
Mike Slemmer
|
c03a6751dd
|
fix test
|
2013-04-25 00:08:19 -07:00 |
|
Mike Slemmer
|
a605fa2083
|
missing file
|
2013-04-24 23:57:45 -07:00 |
|
Mike Slemmer
|
8d4fd2aeaf
|
more recordings work
|
2013-04-24 23:50:52 -07:00 |
|
Mike Slemmer
|
ffffb9a799
|
Claimed recordings
|
2013-04-24 23:50:32 -07:00 |
|
Mike Slemmer
|
2e6cecb7ae
|
fix recordings controller
|
2013-04-24 23:50:02 -07:00 |
|
Seth Call
|
c985c4690b
|
* fixing broken tests from changing how dev/test artifact checks are made
|
2013-04-24 18:20:51 -05:00 |
|
Seth Call
|
423604f869
|
* styling of client update finished; VRFS-302
|
2013-04-24 18:03:58 -05:00 |
|
Brian Smith
|
333c171575
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-22 21:14:36 -04:00 |