Brian Smith
|
5b438ffaef
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-05-31 07:35:07 -04:00 |
|
Brian Smith
|
e1e89d55e8
|
VRFS-1672 session settings dialog work / other bug fixes
|
2014-05-31 07:34:52 -04:00 |
|
Brian Smith
|
a607124e63
|
VRFS-1746 RSVP cancel dialog bug fixes
|
2014-05-29 22:19:30 -04:00 |
Jonathan Kolyer
|
77b6bdf106
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-05-29 16:32:29 +00:00 |
|
Jonathan Kolyer
|
ff15da9f4e
|
VRFS-1665 mail formatting; bug fixing
|
2014-05-29 16:32:22 +00:00 |
|
Jonathan Kolyer
|
f90f55fb11
|
VRFS-1665 added mail delivery test
|
2014-05-29 09:15:46 +00:00 |
|
Jonathan Kolyer
|
f4533ebbf1
|
VRFS-1665 added non-pass case
|
2014-05-29 07:41:28 +00:00 |
|
Jonathan Kolyer
|
243e06533b
|
VRFS-1665 scheduled session impl
|
2014-05-29 07:19:55 +00:00 |
|
Brian Smith
|
f1229f6842
|
VRFS-1746 RSVP cancel dialog work
|
2014-05-29 02:33:37 -04:00 |
|
Brian Smith
|
b640c31301
|
fix test
|
2014-05-29 01:28:40 -04:00 |
|
Brian Smith
|
69c92e1f76
|
fix test
|
2014-05-29 00:45:31 -04:00 |
|
Brian Smith
|
7a4ad83cef
|
merge develop
|
2014-05-29 00:20:09 -04:00 |
|
Brian Smith
|
4d63dad502
|
VRFS-1671 RSVP submit dialog
|
2014-05-28 23:43:57 -04:00 |
Scott Comer
|
ebfe72e11d
|
fix tests for scoring musician search
|
2014-05-28 21:19:50 -05:00 |
|
Brian Smith
|
c7fc7bdc22
|
VRFS-1668 clean up notifications / fix comment notification for session info page
|
2014-05-27 22:35:26 -04:00 |
|
Scott Comer
|
6f57265a0d
|
finish up mods for geocoding based on scores
|
2014-05-27 11:52:18 -05:00 |
|
Brian Smith
|
989a2a2b3a
|
VRFS-1670 session info page work
|
2014-05-27 00:32:14 -04:00 |
|
Brian Smith
|
f31248815d
|
VRFS-1670 session info page work
|
2014-05-26 23:52:59 -04:00 |
|
Scott Comer
|
7446898071
|
added tests for new_musicians
|
2014-05-26 14:16:01 -05:00 |
|
Brian Smith
|
304008d693
|
VRFS-1670 more session info work
|
2014-05-26 14:00:34 -04:00 |
|
Brian Smith
|
cc4686ab79
|
VRFS-1670 session info page work
|
2014-05-26 01:35:57 -04:00 |
|
Brian Smith
|
2cef0872d9
|
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
|
2014-05-25 18:26:54 -04:00 |
Bert Owen
|
bc0e3ba0eb
|
VRFS-1681 cleanup unused notation files
|
2014-05-26 01:30:10 +08:00 |
|
Brian Smith
|
16b240fdc8
|
merge scheduled_sessions branch
|
2014-05-24 04:01:40 -04:00 |
|
Brian Smith
|
a06ba7197e
|
VRFS-1670 session info page work
|
2014-05-24 03:58:47 -04:00 |
|
Bert Owen
|
fbeddf1735
|
VRFS-1682, VRFS-1679 : upload music notation, download music notation
|
2014-05-24 02:58:59 +08:00 |
|
Scott Comer
|
918d65cd92
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-23 10:12:30 -05:00 |
|
Jonathan Kolyer
|
50d1696ad3
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-23 04:54:57 +00:00 |
|
Jonathan Kolyer
|
5f5bcaf04c
|
VRFS-736 updated welcome message; fixed queue loading issue by updating jam_ruby.rb
|
2014-05-23 04:54:46 +00:00 |
|
Scott Comer
|
81495315f7
|
simplify Search.new_musicians api
|
2014-05-22 21:42:07 -05:00 |
|
Scott Comer
|
bf06df36a3
|
added better regions database; added appropriate indexing for regions table
|
2014-05-22 15:17:00 -05:00 |
|
Bert Owen
|
5685e2f0e8
|
VRFS-1678 added music session update feature
|
2014-05-22 17:49:35 +08:00 |
|
Bert Owen
|
00d06fe6f2
|
* merge
|
2014-05-22 16:07:17 +08:00 |
|
Bert Owen
|
57f1fab935
|
VRFS-1677 fixed
|
2014-05-22 16:02:48 +08:00 |
|
Brian Smith
|
b4f7035fed
|
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
|
2014-05-22 00:42:50 -04:00 |
|
Brian Smith
|
03eb125fa8
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-05-22 00:42:33 -04:00 |
|
Brian Smith
|
0e419a7881
|
VRFS-1692 cancel RSVP complete
|
2014-05-22 00:40:17 -04:00 |
|
Brian Smith
|
176e862338
|
VRFS-1691 update RSVP request complete
|
2014-05-21 23:36:34 -04:00 |
|
Scott Comer
|
94421c03c0
|
merge conflict with db/manifest resolved
|
2014-05-21 21:33:38 -05:00 |
|
Scott Comer
|
09231c5fe6
|
fix for vrfs-1476 - scoring should store the detail data
|
2014-05-21 21:30:43 -05:00 |
|
Jonathan Kolyer
|
0b3b4c5dfa
|
merging
|
2014-05-21 22:46:57 +00:00 |
|
Jonathan Kolyer
|
bbd0c27d23
|
VRFS-736 cleanup of sess_notrecord text; added progress mailer queue
|
2014-05-21 22:41:17 +00:00 |
|
Jonathan Kolyer
|
836baee962
|
merging with develop
|
2014-05-21 21:55:26 +00:00 |
Anthony Davis
|
44c895b704
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
monitor/spec/production_spec.rb
|
2014-05-21 16:52:44 -05:00 |
|
Anthony Davis
|
1ce510bb18
|
VRFS-1705 - 'monitor' subproj initial commit
|
2014-05-21 16:52:11 -05:00 |
|
Brian Smith
|
25f325d720
|
VRFS-1690 create RSVP request working
|
2014-05-21 17:47:11 -04:00 |
|
Bert Owen
|
a1f288fe4d
|
VRFS-1676 fixed
|
2014-05-22 03:11:50 +08:00 |
|
Scott Comer
|
4a76e0c983
|
get_work has a larger radius and excludes the current connections address
|
2014-05-21 14:05:45 -05:00 |
|
Bert Owen
|
1904c8f474
|
VRFS-1675 completed
|
2014-05-22 00:24:40 +08:00 |
|
Jonathan Kolyer
|
3fd7805b1d
|
VRFS-736 removed pending send email tests
|
2014-05-21 07:30:20 +00:00 |