 Seth Call
|
7cdd47ac89
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-20 11:53:35 +00:00 |
|
Seth Call
|
b04c7bcea5
|
* VRFS-871 - user-to-user messaging complete
|
2014-03-20 11:53:26 +00:00 |
Jonathan Kolyer
|
e29907f09b
|
merging
|
2014-03-19 18:44:35 +00:00 |
|
Jonathan Kolyer
|
eecdbebf3d
|
VRFS-1483 integrating admin interface
|
2014-03-19 18:42:28 +00:00 |
|
Jonathan Kolyer
|
22104e3a97
|
VRFS-1483 undoing accidently checkin of wsg connect params
|
2014-03-19 16:38:59 +00:00 |
|
Jonathan Kolyer
|
0987cf2cf8
|
VRFS-1483 editing batch emails
|
2014-03-19 16:37:03 +00:00 |
|
Jonathan Kolyer
|
74a5f3863a
|
VRFS-1483 various fixes from testing
|
2014-03-19 16:32:53 +00:00 |
|
Jonathan Kolyer
|
21bd8fcf2f
|
VRFS-1483 removed debug code
|
2014-03-19 16:29:19 +00:00 |
|
Jonathan Kolyer
|
d15c1dbdfd
|
VRFS-1483
|
2014-03-19 07:15:38 +00:00 |
|
Jonathan Kolyer
|
4ba18a88ee
|
VRFS-1483 integrating sendgrid_smtpapi
|
2014-03-19 06:20:58 +00:00 |
|
Jonathan Kolyer
|
e8dd5f6ae5
|
VRFS-1483 state transitions and optimistic locking
|
2014-03-19 04:24:42 +00:00 |
Brian Smith
|
44da456a42
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-18 21:52:54 -04:00 |
|
Brian Smith
|
d00bc8d5fc
|
VRFS-1465 fix instrument icons for sessions on feed
|
2014-03-18 21:52:37 -04:00 |
|
Jonathan Kolyer
|
c6c12e7b9e
|
Merge branch 'develop' into vrfs1483
|
2014-03-19 00:23:32 +00:00 |
|
Jonathan Kolyer
|
17fcd42120
|
VRFS-1483 include resque::mailer
|
2014-03-18 23:39:23 +00:00 |
|
Jonathan Kolyer
|
1c39238fe5
|
VRFS-1483 adding send batch layouts and such
|
2014-03-18 23:05:40 +00:00 |
|
Jonathan Kolyer
|
cdb271bf98
|
VRFS-1483 added async support
|
2014-03-18 22:50:06 +00:00 |
|
Jonathan Kolyer
|
40a2049bdf
|
VRFS-1483 added from_email column to email_batches
|
2014-03-18 20:31:23 +00:00 |
|
Jonathan Kolyer
|
72fb245dd7
|
VRFS-1483 added batch_mailer
|
2014-03-18 19:56:15 +00:00 |
|
Jonathan Kolyer
|
98a4553f72
|
VRFS-1483 specs for test users
|
2014-03-18 18:33:48 +00:00 |
|
Jonathan Kolyer
|
3204de01e6
|
VRFS-1483 merge
|
2014-03-18 15:13:03 +00:00 |
|
Jonathan Kolyer
|
e6d0851391
|
VRFS-1483 adding first set of updates for batch emails
|
2014-03-18 15:07:45 +00:00 |
|
Brian Smith
|
e38494b0f9
|
VRFS-1481 display 256x256 instrument icons on musician profile page
|
2014-03-17 18:55:11 -04:00 |
Scott Comer
|
bfc2a36df4
|
a better version of update for scott
|
2014-03-17 12:53:06 -05:00 |
|
Scott Comer
|
91d76c7f12
|
marking broken location tests as pending; marked broken icecast config tests as pending; disabled some silly and now useless debugging output in get_work
|
2014-03-17 12:21:32 -05:00 |
|
Jonathan Kolyer
|
c8a60a7d83
|
VRFS-1422 removed extra call to facebookHelper.promptLogin() which is unnecessary for feed posts
|
2014-03-17 16:58:48 +00:00 |
|
Scott Comer
|
3ff131c031
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-17 22:39:47 -05:00 |
|
Scott Comer
|
26667bf4c2
|
fix spec broken by no longer supported function countries
|
2014-03-17 22:39:31 -05:00 |
|
Scott Comer
|
82ad25795c
|
disable countries methods which are no longer supported
|
2014-03-17 22:27:38 -05:00 |
|
Scott Comer
|
ddabbcecc5
|
fix countries to use labels for users, bands, and new signups
|
2014-03-17 22:20:41 -05:00 |
|
Scott Comer
|
f7ffa2d7a9
|
fix problem with missing client_type in login tests
|
2014-03-17 11:47:27 -05:00 |
|
Seth Call
|
b783d270b1
|
* VRFS-1457 - resolved two issues; invited users will be able to invite, and the error path will show errors
|
2014-03-15 16:47:21 +00:00 |
|
Seth Call
|
964fcb5f0e
|
* VRFS-1456 - hoverIntent error goes away once you stop including jquery twice\!
|
2014-03-15 04:42:36 +00:00 |
|
Seth Call
|
4c737086e4
|
* VRFS-1454 - 2px bigger on the orange button for the win
|
2014-03-15 02:38:26 +00:00 |
|
Seth Call
|
9324725e3c
|
* VRFS-1451 - fix broken signup link when clicked more than once
|
2014-03-15 01:25:37 +00:00 |
|
Seth Call
|
f9439bd42e
|
* fixing websocket tests
|
2014-03-14 17:02:38 +00:00 |
|
Seth Call
|
f765068017
|
* fix band_spec test
|
2014-03-14 16:40:57 +00:00 |
|
Seth Call
|
9ec7c18d79
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-14 14:44:34 +00:00 |
|
Seth Call
|
993afe1174
|
if either fan access or musician access is public, expose rabl VRFS-1427
|
2014-03-14 14:44:11 +00:00 |
|
Brian Smith
|
fde9c64e11
|
VRFS-1439 fix display issue in musician profile social tab
|
2014-03-14 00:57:28 -04:00 |
|
Brian Smith
|
90ab928a7c
|
VRFS-1448 fix bug with Connect button in Fan hover bubble
|
2014-03-13 22:56:11 -04:00 |
|
Brian Smith
|
5fd204c89e
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-13 20:56:50 -04:00 |
|
Jonathan Kolyer
|
f56fcd6fab
|
Merge branch 'develop' into VRFS-1110
|
2014-03-13 10:53:47 +00:00 |
|
Jonathan Kolyer
|
148fc69950
|
VRFS-1110 in createBandInvitation fixed selector for invitation list
|
2014-03-13 10:51:21 +00:00 |
|
Jonathan Kolyer
|
14fa5e18e5
|
VRFS-1110 clear the friend input beforeShow
|
2014-03-13 10:20:25 +00:00 |
|
Jonathan Kolyer
|
45f2124cfa
|
VRFS-1110 removed autocomplete for session update
|
2014-03-13 10:00:17 +00:00 |
|
Brian Smith
|
0b02e9e323
|
fix JS error with notifications
|
2014-03-13 05:24:24 -04:00 |
|
Jonathan Kolyer
|
c46f8c4476
|
VRFS-1110 added instructions argument
|
2014-03-13 09:23:22 +00:00 |
|
Jonathan Kolyer
|
b428bbb913
|
VRFS-1110 fixed integration of InviteMusiciansUtil to band setup
|
2014-03-13 08:47:27 +00:00 |
|
Jonathan Kolyer
|
a91092a048
|
Merge branch 'develop' into vrfs1110
|
2014-03-13 07:49:10 +00:00 |