 Seth Call
|
70831b622b
|
* fixing jam-admin login break
|
2013-04-22 16:28:10 -05:00 |
|
Seth Call
|
cbe67553df
|
* adding QT5 support for capybara-webkit in gemfile and fixing artifact test
|
2013-04-22 07:05:51 -05:00 |
Brian Smith
|
d7c401a294
|
hide Connect button for current user
|
2013-04-21 22:22:03 -04:00 |
|
Brian Smith
|
54f5a34cda
|
VRFS-303 fix toggling of Add Friend / Follow buttons
|
2013-04-21 15:31:41 -04:00 |
|
Brian Smith
|
4c10ad3df6
|
VRFS-303 About tab for musician profile complete
|
2013-04-20 15:17:44 -04:00 |
|
Seth Call
|
2b37819d6c
|
* reenabling websocket-gateway in default config. sorry
|
2013-04-17 17:01:28 -05:00 |
|
Seth Call
|
d30e83c1f0
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-17 17:01:07 -05:00 |
|
Seth Call
|
3cb2744448
|
* fixing hidden updater progress bar if the 'Connecting...' overlay is present; also fixing the returned path to artifact via rest api
|
2013-04-17 17:01:02 -05:00 |
|
Seth Call
|
75c5375858
|
* removing thin gem from Gemfile
|
2013-04-17 09:31:47 -05:00 |
|
Brian Smith
|
f2c5f0d7b6
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-17 00:47:00 -04:00 |
|
Brian Smith
|
2fd28839d8
|
VRFS-77 VRFS-202 musician profile work
|
2013-04-17 00:46:43 -04:00 |
|
Seth Call
|
a2861c4bb0
|
* some old jam-admin changes. I cant say what exactly they do (old mac recovery)
|
2013-04-16 19:39:07 -05:00 |
|
Seth Call
|
fe222ff13a
|
* perrfdata model
|
2013-04-16 19:36:01 -05:00 |
|
Seth Call
|
d8730fa521
|
* perfdata complete with one entire test (sarcasm)
|
2013-04-16 19:35:42 -05:00 |
|
Seth Call
|
3733bc0c2d
|
* perfdata commit
|
2013-04-16 19:34:37 -05:00 |
|
Seth Call
|
2e157bf157
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-04-15 21:12:18 -05:00 |
|
Seth Call
|
7d17742f46
|
* perfdata
|
2013-04-15 21:12:16 -05:00 |
|
Seth Call
|
226f4b42bb
|
* perfdata merged
|
2013-04-15 21:11:12 -05:00 |
|
Seth Call
|
eb04794d01
|
* perfdata
|
2013-04-15 21:10:46 -05:00 |
|
Seth Call
|
16df6f9106
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-15 21:10:10 -05:00 |
|
Seth Call
|
f5b8ac4da5
|
* perfdata more work
|
2013-04-15 21:10:04 -05:00 |
|
Brian Smith
|
e5950fcbf4
|
remove log debug statements
|
2013-04-14 13:25:16 -04:00 |
|
Brian Smith
|
1879e8165d
|
remove friend request notification from sidebar when accepted
|
2013-04-14 13:24:38 -04:00 |
|
Brian Smith
|
b32d601d02
|
hide action button div if notification has no action pending
|
2013-04-14 08:45:13 -04:00 |
|
Brian Smith
|
48cb2138d6
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-13 22:59:51 -04:00 |
|
Brian Smith
|
939ec9d136
|
VRFS-284 support for Accept Friend Request button in sidebar
|
2013-04-13 22:59:43 -04:00 |
|
Brian Smith
|
7b94ffae0e
|
changes
|
2013-04-13 22:59:14 -04:00 |
|
Brian Smith
|
da720c4f1c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-04-13 22:58:38 -04:00 |
|
Brian Smith
|
3700738b84
|
VRFS-284 support for Accept Friend Request button in sidebar
|
2013-04-13 22:58:31 -04:00 |
|
Brian Smith
|
a764ff9793
|
merge
|
2013-04-13 22:57:04 -04:00 |
|
Brian Smith
|
22094206b4
|
add friend request id to notifications table
|
2013-04-13 22:56:19 -04:00 |
Mike Slemmer
|
21092e1b50
|
wtf
|
2013-04-12 18:54:30 -07:00 |
|
Mike Slemmer
|
9e3497e270
|
add mix routes
|
2013-04-12 17:17:00 -07:00 |
|
Mike Slemmer
|
7ba0317aeb
|
return mixes with recordings
|
2013-04-12 17:16:40 -07:00 |
|
Mike Slemmer
|
3abde183b7
|
added model stuff for mix
|
2013-04-12 15:36:05 -07:00 |
|
Mike Slemmer
|
481919d1f3
|
add the actual file
|
2013-04-12 15:34:59 -07:00 |
|
Mike Slemmer
|
e9137aef38
|
mixes migration
|
2013-04-12 15:34:41 -07:00 |
|
Seth Call
|
d690d5c31b
|
* disabling cucumber until capybara-webkit 1.0.0. is released
|
2013-04-10 20:31:17 -05:00 |
|
Seth Call
|
528c2c29d4
|
* fixing last of capybara 2.1.0 breaking issues
|
2013-04-10 17:19:03 -05:00 |
|
Seth Call
|
1a31f2bf92
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-04-10 17:14:31 -05:00 |
|
Seth Call
|
315f5077b9
|
* adding jam-web support for client update. fixing capybara 2.1.0 breaking changes
|
2013-04-10 17:14:19 -05:00 |
Jonathon Wilson
|
d5159a7ca9
|
Wire l2m mix to back end bridge calls
|
2013-04-10 09:01:29 -06:00 |
|
Seth Call
|
b083f15304
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-04-10 01:16:13 -05:00 |
|
Seth Call
|
8ca4848d28
|
* updating ArtifactUpdate to reflect new mandatory fields
|
2013-04-10 01:16:04 -05:00 |
|
Seth Call
|
292f77c8df
|
* putty my manifest entry last
|
2013-04-10 01:14:20 -05:00 |
|
Seth Call
|
c46a2c2a2c
|
* requiring md5 and size of artifacts so that we can report them in artifact REST API
|
2013-04-10 01:13:40 -05:00 |
|
Brian Smith
|
d22c621712
|
remove alert
|
2013-04-06 21:47:37 -04:00 |
|
Brian Smith
|
23a0c16b7f
|
add null check for source_user before returning photo_url
|
2013-04-06 21:43:00 -04:00 |
|
Brian Smith
|
09c36788c2
|
VRFS-287 add support for deleting notifications from sidebar
|
2013-04-06 21:41:43 -04:00 |
|
Brian Smith
|
c593551efd
|
refactored friend request code to common place for use by sidebar and main results screen
|
2013-04-06 21:04:18 -04:00 |