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 |
|
Anthony Davis
|
dc9b17fa46
|
production_spec.rb moved to 'monitor' subproject
|
2014-05-21 21:51:28 +00: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 |
|
Jonathan Kolyer
|
b235817a0c
|
VRFS-736 undo accidental commit
|
2014-05-21 07:19:02 +00:00 |
|
Jonathan Kolyer
|
6c0807ac5a
|
VRFS-736 adding email content for progression steps
|
2014-05-21 07:17:42 +00:00 |
|
Jonathan Kolyer
|
9ad0badff1
|
VRFS-736 filling out remaining subtypes
|
2014-05-21 06:20:15 +00:00 |
|
Jonathan Kolyer
|
b998b87a01
|
VRFS-736 refactoring
|
2014-05-21 06:06:16 +00:00 |
|
Brian Smith
|
7f5940ac01
|
VRFS-1739 API for RSVP slots
|
2014-05-21 01:36:32 -04:00 |
|
Jonathan Kolyer
|
70f34120b3
|
VRFS-736 refactoring
|
2014-05-21 05:24:52 +00:00 |
|
Brian Smith
|
f793b14879
|
VRFS-1738 more RSVP API work
|
2014-05-21 00:57:32 -04:00 |
|
Scott Comer
|
867ec7c53f
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-20 10:07:05 -05:00 |
|
Scott Comer
|
3e0667e24d
|
added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api
|
2014-05-20 09:46:45 -05:00 |
|
Bert Owen
|
22f4d0ffc5
|
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-05-20 21:26:55 +08:00 |
|
Bert Owen
|
cebbd869cb
|
VRFS-1675 add join session feature
|
2014-05-20 21:26:32 +08:00 |
|
Bert Owen
|
b4908ce924
|
* fix music session api test
|
2014-05-20 21:23:34 +08:00 |
|
Brian Smith
|
96f62b1364
|
VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work
|
2014-05-20 02:45:00 -04:00 |
|
Jonathan Kolyer
|
f53ca0010d
|
VRFS-736 looping through results
|
2014-05-20 05:58:06 +00:00 |
|
Jonathan Kolyer
|
cd801d7852
|
VRFS-736 fixing progression email algorithm and tests
|
2014-05-20 05:21:11 +00:00 |
 Seth Call
|
d11261c5c6
|
* VRFS-1730 - websocket on web layout
|
2014-05-20 00:33:43 -04:00 |
|
Brian Smith
|
d665a09080
|
scheduled session rsvp wip
|
2014-05-20 00:31:26 -04:00 |
|
Brian Smith
|
ca53ee0ead
|
update data model / fix tests
|
2014-05-19 23:34:56 -04:00 |
|
Seth Call
|
a0fbd433b3
|
* brought back two pending test
|
2014-05-19 18:49:02 -05:00 |
|
Seth Call
|
1f86b809ff
|
* VRFS-1730 - websocket on web layout
|
2014-05-19 16:57:08 -05:00 |
|
Bert Owen
|
a379689418
|
* remove client_id check
|
2014-05-19 23:52:06 +08:00 |
|
Bert Owen
|
97843035ba
|
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-05-19 23:36:23 +08:00 |
|
Bert Owen
|
cdc9d121cb
|
VRFS-1674 Create Session API
|
2014-05-19 23:35:38 +08:00 |
|
Jonathan Kolyer
|
e44ccc7653
|
VRFS-736 client_notdl mailer
|
2014-05-19 15:12:59 +00:00 |
|
Jonathan Kolyer
|
4ddd699302
|
VRFS-736 filling out progression steps
|
2014-05-19 04:35:25 +00:00 |
|
Jonathan Kolyer
|
30f2387658
|
VRFS-736
|
2014-05-19 03:23:14 +00:00 |
|
Brian Smith
|
dce007a13d
|
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
|
2014-05-18 22:31:25 -04:00 |
|
Jonathan Kolyer
|
f6196bb2c8
|
VRFS-736 consolidating query
|
2014-05-19 00:43:37 +00:00 |
|
Brian Smith
|
95100a1b49
|
VRFS-1668 added some edge case tests for new notifications (still need sunny day tests)
|
2014-05-18 14:59:57 -04:00 |
|
Jonathan Kolyer
|
1271b74bc4
|
VRFS-736 passing tests
|
2014-05-18 06:14:19 +00:00 |
|
Jonathan Kolyer
|
fbb86dd9e7
|
VRFS-736 tests passing and what-not
|
2014-05-18 05:24:07 +00:00 |
|
Brian Smith
|
0b2acda11e
|
VRFS-1668 email notifications for scheduled sessions
|
2014-05-18 01:22:20 -04:00 |
|
Brian Smith
|
8fc30baf42
|
VRFS-1668 more notification work
|
2014-05-18 00:09:21 -04:00 |
|
Scott Comer
|
a1b8d78e6a
|
fix a problem with band location vs. user location management
|
2014-05-17 22:09:31 -05:00 |
|
Jonathan Kolyer
|
6e7562ffc8
|
VRFS-736 progression emails first pass
|
2014-05-18 00:12:01 +00:00 |
|
Scott Comer
|
9eaa34b07f
|
disable lat lng and distance in queries for users
|
2014-05-17 14:55:26 -05:00 |
|
Jonathan Kolyer
|
72110cb057
|
Merge branch 'develop' into vrfs1664
|
2014-05-17 17:43:35 +00:00 |
|
Jonathan Kolyer
|
b393cf35c4
|
VRFS-1664 STI columns for email batches
|
2014-05-17 17:42:47 +00:00 |
|
Jonathan Kolyer
|
c51d7de5f4
|
VRFS-1664 some tweaks
|
2014-05-17 17:38:42 +00:00 |
|
Jonathan Kolyer
|
e330fb96c7
|
VRFS-1664 some tweaks
|
2014-05-17 17:38:22 +00:00 |
|
Jonathan Kolyer
|
7428a2f26b
|
VRFS-1664 new musician weekly email
|
2014-05-16 07:58:06 +00:00 |