Commit Graph

7883 Commits

Author SHA1 Message Date
Brian Smith d5f1b95652 VRFS-277 hide Connect button for existing friends in search results 2013-04-06 20:42:18 -04:00
Brian Smith 7d9f52ff33 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-04-06 20:24:09 -04:00
Brian Smith 6b894589e9 VRFS-285 update notification count in sidebar when receiving or deleting notification 2013-04-06 20:23:39 -04:00
Jonathon Wilson b6e4a3fcea Markup/CSS rework, visual me vs others mix slider. No back-end wireup yet. 2013-04-06 10:59:55 -06:00
Brian Smith c3824cac25 VRFS-282 changes to support real-time notification updates in sidebar 2013-04-04 23:57:16 -04:00
Brian Smith d68b95cf73 VRFS-282 changes to support real-time notification updates in sidebar 2013-04-04 23:51:01 -04:00
Brian Smith 1328231830 VRFS-282 changes to support real-time notification updates in sidebar 2013-04-04 23:33:59 -04:00
Brian Smith 4bc3ba3309 VRFS-282 changes to support real-time notification updates in sidebar 2013-04-04 23:33:34 -04:00
Brian Smith e53f712779 VRFS-282 changes to support real-time notification updates in sidebar 2013-04-04 13:12:06 -04:00
Brian Smith e43f7effae remove log file 2013-03-31 17:50:43 -04:00
Brian Smith 28ecbdfa48 fix tests / move notification types to constants file 2013-03-31 17:49:47 -04:00
Brian Smith 7ec4d6021d VRFS-282 VRFS-283 toasts / notifications for friend updates and requests 2013-03-31 14:07:46 -04:00
Brian Smith 7d26ab8aab VRFS-282 VRFS-283 toasts / notifications for friend updates and requests 2013-03-31 14:07:25 -04:00
Brian Smith a1a0967ab9 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-31 09:54:04 -04:00
Brian Smith 051a68c5a5 VRFS-282 VRFS-283 toasts / notifications for friend updates and requests 2013-03-31 09:54:00 -04:00
Jonathon Wilson 34960f3ca3 Karma CI from Chrome to PhantomJS 2013-03-30 21:31:38 -06:00
Jonathon Wilson a53481c4a1 Track settings icon to open dialog 2013-03-30 20:11:59 -06:00
Jonathon Wilson 95b1fd7c99 Build fixes for Karma test runner 2013-03-30 17:54:46 -06:00
Jonathon Wilson a8dd274c45 Switch to Karma JS test runner 2013-03-30 16:55:37 -06:00
Jonathon Wilson fc630dcb98 Allow tab-selection in dialogs 2013-03-28 20:26:59 -06:00
Seth Call daff290db5 * taking out spurious puts 2013-03-27 16:02:33 -05:00
Seth Call 13215ce0d3 * fixing one egregrous error 2013-03-27 16:02:00 -05:00
Seth Call effc3397f4 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-27 10:16:25 -05:00
Seth Call f04a2bad33 * working on perfdata 2013-03-27 10:16:20 -05:00
Seth Call 90e6d23bb7 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2013-03-27 10:09:19 -05:00
Seth Call 14e297b5b1 * adding perfdata models 2013-03-27 10:09:14 -05:00
Seth Call 305af36633 * adding perfdata models 2013-03-27 10:08:43 -05:00
Jonathon Wilson 591a29431e Set broadcast flag on mixer control changes 2013-03-24 14:47:45 -06:00
Jonathon Wilson a09f32df1b TrackVolume and JamClient updates for fakes 2013-03-24 14:18:58 -06:00
Brian Smith 0104834c75 remove alert 2013-03-23 04:11:06 -04:00
Brian Smith f1ac2a951e fix tests 2013-03-23 04:08:28 -04:00
Brian Smith ac074dd75c VRFS-281 debugging 2013-03-23 03:51:55 -04:00
Brian Smith 7a0d927060 VRFS-281 debugging issues 2013-03-23 03:50:01 -04:00
Brian Smith 50494c5fbd VRFS-281 added friend request messages 2013-03-23 03:49:19 -04:00
Brian Smith 0364f7561d VRFS-281 added table for persistent notifications 2013-03-21 23:19:35 -04:00
Brian Smith 5c59e55149 VRFS-281 added abstraction layer for notifications 2013-03-21 23:18:41 -04:00
Brian Smith 6253e782fe Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-21 23:00:09 -04:00
Jonathon Wilson 529bc5a265 Re-enable notifications and bring in Jeff's styles. Test link for now. 2013-03-21 20:46:58 -06:00
Jonathon Wilson 8333042806 Add dialog visual pieces 2013-03-21 19:28:03 -06:00
Brian Smith 95153a4ac0 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-21 20:17:33 -04:00
Brian Smith eecbbdcbd4 VRFS-281 initial dev for notification framework 2013-03-21 20:17:28 -04:00
Seth Call 67fd1fa30c * VRFS-200 rest api implemented 2013-03-21 02:22:01 -05:00
Seth Call 1fb66dc77b * fixing can_invite for administrative invites and making sure to send email only on after_create 2013-03-21 02:12:28 -05:00
Seth Call 9666c9e9f8 * VRFS-200; invitation to service REST APIs done 2013-03-21 01:47:35 -05:00
Seth Call 21ab1db405 * VRFS-200 added a can_invite check so that endusers can't create an invite 2013-03-21 01:47:11 -05:00
Seth Call 7d62c292cb VRFS-278 musician_instruments are now populated on signup failure 2013-03-21 00:04:44 -05:00
Seth Call 1b43341cca * VRFS-275 adding error bounding boxes to forms 2013-03-20 22:56:47 -05:00
Jonathon Wilson 4596a8fc2c Add error css 2013-03-19 19:34:29 -06:00
Seth Call 754f273332 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-15 01:08:21 -05:00
Seth Call 23f56906d9 * fixing use of _url to _path so that it's a relative path 2013-03-15 01:04:59 -05:00