Commit graph

905 commits

Author SHA1 Message Date
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
2012-01-17 19:29:01 -08:00
danielgrippi
fdc0b681eb remove unused api serializers (cruft) 2012-01-17 16:03:24 -08:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Jonne Haß
9a9cc8d826 remove spec for aspect_memberships#update too (move_contact) 2012-01-13 22:46:32 +01:00
Dennis Collinson
9b8afba9cf metaprogram template addition 2012-01-12 19:41:39 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications"
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
2012-01-11 12:11:00 -08:00
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications
Allow users to click on read notifications to mark them as unread
2012-01-10 10:46:26 -08:00
Maxwell Salzberg
232c4b7931 fix for mobile multi stream [ci skip] 2012-01-07 23:31:17 -08:00
danielgrippi
e928cc805a fixed markdown issues with reshares; removed puts from specs 2012-01-07 17:33:16 -08:00
danielgrippi
24950bd364 restored ability to 'unlike' 2012-01-07 14:23:28 -08:00
Dennis Collinson
9d24b518f5 DC DG; correctly populate the stream jasmine fixture 2012-01-07 14:23:28 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
1e20ca0cf5 remove old js files, specs; remove stream references in page js initializers 2012-01-07 14:23:27 -08:00
danielgrippi
4fabbe93a5 fix ResharesController / StatusMessage controller spec; remove another js response 2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68 modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine 2012-01-07 14:23:26 -08:00
danielgrippi
21eba82e76 moved all jasmine fixture building into spec/controllers/jasmine_fixtures/ 2012-01-07 14:23:25 -08:00
danielgrippi
734f01402a remove double fixture rendering 2012-01-07 14:23:24 -08:00
danielgrippi
1ffdfa8465 DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green 2012-01-07 14:23:24 -08:00
danielgrippi
c6e4172926 fixed likes_controller; half of the failing jasmine tests 2012-01-07 14:23:23 -08:00
danielgrippi
9e4e58e002 fix facebook specs; comment controller specs 2012-01-07 14:23:22 -08:00
danielgrippi
34e3403e2e jasmine green again; template switching in place, defaulting to displaying post text 2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe make jasmine view tests work, load templates, party 2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until
we find a better way to reimpliment it in a  more sane way
2012-01-03 18:39:54 -08:00
memarko
399bdb885e Update spec/controllers/tag_followings_controller_spec.rb 2011-12-26 21:51:02 +01:00
memarko
360e041bf6 Update spec/controllers/tag_followings_controller_spec.rb 2011-12-26 19:01:27 +01:00
Steven Fuchs
f72a4b4476 notifications controller should return the guid and unread state of the updated notification 2011-12-23 22:58:01 -05:00
Steven Fuchs
a1d474111b controller now only accepts string values for unread. 2011-12-23 15:35:07 -05:00
Steven Fuchs
f3486e831f changes is_unread parameter to unread 2011-12-22 22:57:05 -05:00
Steven Fuchs
f2be6e8bcf controller can accept a parameter as to whether the notification should be marked as read or unread 2011-12-22 15:20:48 -05:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
afb5e5e7f0 fix json in aspects controller spec 2011-12-11 03:35:19 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
danielgrippi
fb39a1e16d fix account deletion specs 2011-12-09 17:51:45 -08:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
Pistos
a5d1657fbd Repair posts_controller_spec.rb by refactoring them a bit. Rspec was being finnicky or something? 2011-12-08 15:35:16 -05:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -08:00
Gonzalo Rodriguez
3c74f3d848 Failing spec for empty search bug #2427 2011-12-03 21:19:58 -02:00
Sarah Mei
4db288bc65 Check order of generation and use of host-meta fixture on travis 2011-11-30 20:55:59 -08:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream
Like stream
2011-11-30 09:11:17 -08:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Johannes Hackel
0c1be5002d end 2011-11-23 08:00:08 +01:00