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

10803 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
67b2af0da6 check if ca_file is commented out completly 2012-01-02 21:07:46 +01:00
Florian Staudacher
03ff3bc45d this fixes #2567 (again), but this time it should cover all possible content lengths. 
the hovercard grows with the content up to 400px, then cuts it off and appends '...'
 2012-01-02 16:56:41 +01:00
Jonne Haß
934175c49c updated 15 locale files [ci skip] 2012-01-01 12:55:03 +01:00
danielgrippi
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
Daniel Grippi
ab8fb88e74 Merge pull request #2524 from memarko/patch-2 
Update lib/stream/followed_tag.rb
 2011-12-31 10:51:51 -08:00
danielgrippi
018d516b48 rescue pubsubhubbub error if your pod is offline (resolves issue when posting public posts in dev mode with no internet connectivity) 2011-12-31 13:47:53 -05:00
Maxwell Salzberg
5bbfebdba9 the invite emailer is not multipart...sigh 2011-12-30 20:54:00 -08:00
danielgrippi
6ab03d33b4 hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions) 2011-12-30 23:51:13 -05:00
Daniel Grippi
27f580f241 Merge pull request #2560 from memarko/patch-3 
Update spec/controllers/tag_followings_controller_spec.rb
 2011-12-30 18:21:51 -08:00
Jonne Haß
2268a992f7 make serve_static_assets setting configurable 2011-12-29 16:39:17 +01:00
Jonne Haß
4bfd03d6eb remove completly unused redis.yml 2011-12-29 15:53:27 +01:00
Jonne Haß
f774ceae1b do not handle redis stuff in script/server, let the user do it 2011-12-29 15:45:28 +01:00
Sarah Mei
6236fd22a0 Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others. 2011-12-27 14:48:39 -08:00
Jonne Haß
109c5b7a17 this should fix #2552 2011-12-26 23:21:04 +01: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
Jonne Haß
c766163422 pull in ka 2011-12-24 14:12:36 +01:00
Jonne Haß
f4b234088d updated 4 locale files [ci skip] 2011-12-24 14:10:23 +01:00
Steven Fuchs
95b553f953 notifications popup menu should use functions from regular notification object. 2011-12-23 23:01:18 -05:00
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