nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11184 commits 4 branches 0 tags 121 MiB
Commit graph

11184 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steven Fuchs
02531337cb break actions into separate functions. Make css changes happen inside the completion functions 2011-12-23 23:00:16 -05:00
Steven Fuchs
f23ac92b1e notification elements should have a hover state since they are live. 2011-12-23 22:58:38 -05: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
Jonne Haß
a8357388c9 updated 47 locale files [ci skip] 2011-12-24 00:59:36 +01:00
Jonne Haß
d063db42aa fix app config spec 2011-12-24 00:04:04 +01:00
Steven Fuchs
a1d474111b controller now only accepts string values for unread. 2011-12-23 15:35:07 -05:00
Steven Fuchs
cd75c6ea67 cleaner reading of unread parameter 2011-12-23 11:36:20 -05:00
Lennart Prelle
0a83b0d37a forget the return 2011-12-23 13:51:40 +01:00
Lennart Prelle
9ab4cd113e remove redirect to stream from settings 2011-12-23 13:44:41 +01:00
Steven Fuchs
1519cdd672 new parameter name and fix to notification badge css 2011-12-22 22:57:33 -05:00
Steven Fuchs
f3486e831f changes is_unread parameter to unread 2011-12-22 22:57:05 -05:00
danielgrippi
5bbbad7c4f added missing pluralizations 2011-12-22 14:30:15 -08:00
Steven Fuchs
4d6f53401b makes sure that the large notification count badge on the notifications page gets incremented and decremented. Not the neatest solution since this code can be called from many pages, but shouldn't cause any problems in that case. 2011-12-22 15:57:59 -05:00
Steven Fuchs
b6dd14a968 clicking on notifications takes note of the current UI state and makes sure that the resulting 'read' state matches the users expectation. 2011-12-22 15:56:03 -05:00
Steven Fuchs
a7af886da2 add 'read' class ro read messages to match the 'unread' class associated with unread messages. This will keep us from attaching jquery functionality to notification types we may not know about. 2011-12-22 15:53:14 -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
Jonne Haß
2817fb95de do not use example config if there's a custom one 2011-12-22 02:03:41 +01:00
Maxwell Salzberg
c258755af5 Merge branch 'remove_splunk' 2011-12-21 14:24:19 -08:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
0866ebb962 remove unused GIT_INFO [ci skip] 2011-12-21 23:19:22 +01:00
Jonne Hass
a23a79f5b5 updated 148 locale files [ci skip] 2011-12-21 13:13:42 +01:00
dangold1138
39d509f4ce Update README.md 2011-12-20 23:19:26 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
danielgrippi
aac97303ce removed duplicate line in a feature [ci skip] 2011-12-20 12:59:15 -08:00
danielgrippi
4ae0dcec43 fix notifications cucumber features 2011-12-20 12:30:29 -08:00
danielgrippi
e9b6da605f fix specs; move presence_of_content validation check into a before_destory to play nicely with federation 2011-12-20 10:42:30 -08:00
Pistos
5110b4c086 Added MySQL-friendly version of SQL code for migration. 2011-12-19 17:12:17 -05:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary. 2011-12-19 17:12:17 -05:00
Pistos
a604dd2aa6 Refactor implementation of #reshare_count. 
The old implementation which uses Post.where causes

  undefined method `abstract_class?' for Object:Class

in spec/controllers/posts_controller_spec.rb.  Not sure whether that's a problem
with Rails, or rspec, or what.
 2011-12-19 17:12:17 -05:00
Pistos
51566ebe0b Improve wording of error message in Reshare#root_must_be_public validation. 2011-12-19 17:12:17 -05:00
Pistos
a9c6905e29 Made spec text correspond to actual text tested. 2011-12-19 17:12:17 -05:00
Pistos
99f2d4f018 Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original"). 2011-12-19 17:12:17 -05:00
Pistos
90d960bac7 Some reshare_link specs. 2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44 Always show "Reshare original" for link. Show number of reshares in the post_initial_info div. 
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared.  Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares".  Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
 2011-12-19 17:12:17 -05:00
Daniel Grippi
31fda67dd3 Merge pull request #2533 from vcuculo/2488-fix-oembed 
Fix #2488 soundcloud embedding
 2011-12-19 13:45:56 -08:00
Maxwell Salzberg
e7b9dd8b8a Merge branch 'new_messagebus_api' 2011-12-19 13:40:31 -08:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Vittorio Cuculo
0e77fcb084 Fix #2488 soundcloud embedding 2011-12-19 09:50:39 +01:00
Jonne Hass
bbfb47b6a3 added fil, ms, te 2011-12-18 15:37:27 +01:00
Jonne Hass
54781aa71c updated 148 locale files [ci skip] 2011-12-18 14:53:08 +01:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
Maxwell Salzberg
0929f153a1 Merge pull request #2528 from torrancew/with_whenever_tasks 
Adds maintenance rake tasks for logrotate and temp file deletion
 2011-12-16 09:59:32 -08:00
Tray Torrance
dc71396a4d Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file 2011-12-15 15:18:07 -08:00
Jonne Hass
139e2af6c8 Merge pull request #2527 from lprelle/close_account_translation 
added translation for close account button
 2011-12-15 07:46:38 -08:00
Jonne Hass
e6f614b21c improve pod_url docs [ci skip] 2011-12-15 16:39:54 +01:00
Lennart Prelle
20a39714bf added translation for close account 2011-12-15 15:35:30 +01:00
Jonne Hass
56f0457c03 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-15 14:01:53 +01:00
Jonne Hass
af66bfe840 updated 18 locale files [ci skip] 2011-12-15 14:01:32 +01:00
memarko
890195b2d8 Update lib/stream/followed_tag.rb 2011-12-14 21:15:58 +01:00