Jonathan Kolyer
|
ed09892284
|
merging develop and vrfs1576
|
2014-04-23 07:50:50 +00:00 |
|
Jonathan Kolyer
|
55b149827a
|
VRFS-1576 report layout
|
2014-04-23 07:43:35 +00:00 |
|
Jonathan Kolyer
|
a7d83064df
|
VRFS-1576 fixing redirect paths to use active_admin_template
|
2014-04-23 06:39:49 +00:00 |
|
Jonathan Kolyer
|
7b2d124b33
|
VRFS-1576 affiliate report view integration
|
2014-04-23 06:38:49 +00:00 |
|
Jonathan Kolyer
|
22566f1b29
|
VRFS-1576 added block to referrals_by_date
|
2014-04-23 06:34:21 +00:00 |
Brian Smith
|
5fa2319daa
|
VRFS-1558 make play/comment/like icons clickable in feed and add share icon
|
2014-04-23 02:07:46 -04:00 |
|
Brian Smith
|
7180516e75
|
fix formatting issue in feed where time was indented too far
|
2014-04-23 02:00:55 -04:00 |
|
Jonathan Kolyer
|
c66f5879cf
|
VRFS-1576 fixed referrals_by_date to support pagination
|
2014-04-23 02:43:13 +00:00 |
 Seth Call
|
5b92445021
|
* release branch pushes from jenkins
|
2014-04-22 17:59:42 +00:00 |
|
Seth Call
|
5695338266
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-22 17:53:49 +00:00 |
|
Seth Call
|
30ca8d7c5c
|
* wip still on new ftue. also push release branches to repository VRFS-1639
|
2014-04-22 17:53:41 +00:00 |
|
Jonathan Kolyer
|
b232344336
|
VRFS-1576 added referrals_by_date and associated test
|
2014-04-22 07:12:05 +00:00 |
Bert Owen
|
b95e1a7f1b
|
fix band setup view for band spec
|
2014-04-22 07:30:53 +02:00 |
|
Jonathan Kolyer
|
af63b03d6a
|
VRFS-1576 case insensitive codes
|
2014-04-22 02:14:22 +00:00 |
|
Jonathan Kolyer
|
6ee83f8dcc
|
VRFS-1576 error handling; referral page; new admin menu
|
2014-04-22 01:55:40 +00:00 |
|
Bert Owen
|
15064ad6c0
|
VRFS-1567 fix default sender, add new migration for email_batches table
|
2014-04-21 10:39:08 -07:00 |
|
Bert Owen
|
4cfc1b878a
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-21 17:18:11 +02:00 |
|
Bert Owen
|
7893affafb
|
VRFS-1592 add custom message in app dialog, fix test
|
2014-04-21 17:17:40 +02:00 |
|
Bert Owen
|
8563c82802
|
VRFS-1602 remove web/db/schema.db file
|
2014-04-21 10:05:34 +02:00 |
|
Bert Owen
|
5d9d87bc56
|
VRFS-1592 show app dialog, without customization.
|
2014-04-21 10:04:37 +02:00 |
|
Jonathan Kolyer
|
c81e581786
|
Merge branch 'develop' into vrfs1576
|
2014-04-21 03:55:43 +00:00 |
|
Jonathan Kolyer
|
62dbeaa818
|
VRFS-1576 added validation and tests
|
2014-04-20 23:20:27 +00:00 |
|
Jonathan Kolyer
|
245727806d
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:55:40 +00:00 |
|
Jonathan Kolyer
|
937efed3e5
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:54:49 +00:00 |
Anthony Davis
|
f85f303da8
|
VRFS-1331 - JamKazam instead of Jamkazam
|
2014-04-20 16:43:58 -05:00 |
|
Bert Owen
|
fc1fa1412f
|
VRFS-1592 fixed
|
2014-04-20 20:16:37 +02:00 |
|
Bert Owen
|
404670c9a5
|
VRFS-1609 fixed
|
2014-04-19 12:52:54 -07:00 |
|
Bert Owen
|
6e5848fe60
|
VRFS-1602 Writing tests.
|
2014-04-19 12:24:30 -07:00 |
|
Bert Owen
|
bd0df88e24
|
link musician/band profile on feed page
|
2014-04-18 19:14:11 -07:00 |
|
Seth Call
|
0a811a147c
|
* adding bert as a dev user
|
2014-04-16 17:13:55 +00:00 |
|
Seth Call
|
585385351d
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-16 17:11:39 +00:00 |
|
Seth Call
|
d1267dff53
|
* wip on new ftue
|
2014-04-16 17:11:30 +00:00 |
|
Anthony Davis
|
addc1e0475
|
VRFS-905 and also fix failed test
|
2014-04-15 22:09:16 -05:00 |
|
Anthony Davis
|
ca78165cf0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 21:03:51 -05:00 |
|
Anthony Davis
|
e3b57da087
|
VRFS-1616 fixed javascript c&p error
|
2014-04-15 21:03:39 -05:00 |
|
Seth Call
|
ac1b5d2e42
|
* fix for timecop
|
2014-04-15 17:02:51 +00:00 |
|
Seth Call
|
1d6741714d
|
* resque_spec path removed
|
2014-04-15 15:17:44 +00:00 |
|
Seth Call
|
21a101cc56
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-15 15:02:57 +00:00 |
|
Seth Call
|
87f0eaa07b
|
* VRFS-1612 - fix for invitations showing up when they shouldn't. also new ftue wip progres
|
2014-04-15 15:02:45 +00:00 |
|
Anthony Davis
|
7a5f5ef93c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 15:52:52 -05:00 |
|
Anthony Davis
|
08951258a8
|
VRFS-905 - adding bands integration tests
|
2014-04-14 15:52:26 -05:00 |
|
Jonathan Kolyer
|
bf1e315b48
|
Merge branch 'develop' into vrfs925
|
2014-04-14 10:59:58 +00:00 |
|
Brian Smith
|
e01409a0fb
|
VRFS-1530 added missing semicolon (not sure if this will fix issue or not - unable to reproduce)
|
2014-04-15 00:48:48 -04:00 |
|
Brian Smith
|
e5a6f01198
|
VRFS-1529 hover bubbles should render above dialogs
|
2014-04-15 00:14:02 -04:00 |
|
Jonathan Kolyer
|
9ddbc6ba5c
|
VRFS-925 finishing up tests
|
2014-04-14 10:57:21 +00:00 |
|
Seth Call
|
83038cf315
|
* tweak hover code
|
2014-04-11 14:45:54 +00:00 |
|
Seth Call
|
5e62890003
|
* more debugs in failing build server tests
|
2014-04-11 02:58:31 +00:00 |
|
Seth Call
|
7c16c5f915
|
* adding more puts, and waiting longer for tests to start
|
2014-04-11 02:29:59 +00:00 |
|
Seth Call
|
4e8af1cf32
|
* adding build server debug statements
|
2014-04-11 01:56:12 +00:00 |
|
Seth Call
|
e983e3d186
|
* ok, last time I remove stuff from maintanance page. probably
|
2014-04-10 19:40:46 +00:00 |