Commit graph

16111 commits

Author SHA1 Message Date
Sandip Trivedi
36d6c5d2ba Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
closes #6001
2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil
closes #5991
2015-05-28 01:34:24 +02:00
Steffen van Bergerem
6206bb9920 Update markdown-it-hashtag
closes #5998
2015-05-28 01:28:15 +02:00
Benjamin Neff
5655eead7c make the logrotation configurable
closes #5994
2015-05-28 01:26:48 +02:00
Dennis Schubert
62e8f87f2c Do not mute ActiveRecord::RecordNotUnique for now see #5971, regression from #5938
closes #5992
2015-05-26 05:25:39 +02:00
Benjamin Neff
4f2ee11158 split eye output in 2 logfiles and forward stdout to terminal in dev mode
closes #5989
2015-05-26 03:06:42 +02:00
Benjamin Neff
b491ecac31 wrap the sidekiq logger to add the context info again
closes #5988
2015-05-25 04:23:28 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
2015-05-25 04:18:38 +02:00
Benjamin Neff
986ad0df14 fix validation for status-message when the author is missing
closes #5986
2015-05-24 11:16:05 +02:00
Benjamin Neff
8531b160a6 gracefully handle when a like is already deleted again
closes #5983
2015-05-24 02:30:02 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid
closes #5978
2015-05-23 01:24:09 +02:00
Benjamin Neff
be3b2852be use logging-logger for sidekiq
closes #5975
2015-05-22 02:53:50 +02:00
Benjamin Neff
ac96232d85 use logging gem for better logging with class name and log-level 2015-05-22 02:53:19 +02:00
Benjamin Neff
49f0fb6dcd replace silence_assets.rb with quiet_assets gem 2015-05-22 02:53:19 +02:00
Jonne Haß
47672dcd6b ensure tmp/pids exists [ci skip] 2015-05-21 17:25:47 +02:00
Benjamin Neff
9cc0faa4e6 fixes reshares with no text but with photo
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92

closes #5976
2015-05-21 00:46:50 +02:00
Benjamin Neff
9a4a7255e7 remove unused older and newer methods for posts
last renamed in 8386179f16

closes #5970
2015-05-19 10:42:39 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view
closes #5968
2015-05-19 03:00:51 +02:00
Benjamin Neff
cde9b24476 fix margin/padding for "original post deleted"-message 2015-05-19 02:59:31 +02:00
Benjamin Neff
267a1df3c4 fix root_diaspora_id when root was deleted 2015-05-19 02:59:31 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email
closes #5967
2015-05-19 02:58:37 +02:00
Jonne Haß
4bde00177c replace foreman with eye
closes #5966
2015-05-19 02:55:31 +02:00
Jonne Haß
a21de8b190 Make listen directive for Unicorn configurable 2015-05-19 02:55:01 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
2015-05-18 03:31:11 +02:00
Benjamin Neff
85087123f0 remove travis hax ... works on here ... I hope on travis too
closes #5964
2015-05-18 03:23:39 +02:00
Benjamin Neff
494c03a3fd re add user atom feed on profile-page 2015-05-18 03:23:15 +02:00
Benjamin Neff
7cccb6594f remove security hax comment 2015-05-18 03:23:15 +02:00
Benjamin Neff
196e438286 remove some hardcoded diasporahq hax 2015-05-18 03:23:14 +02:00
Jonne Haß
d2467319ed Bump open_graph_reader 2015-05-17 20:44:37 +02:00
Steffen van Bergerem
6bec3d67ed Update markdown-it-sanitizer and markdown-it-for-inline
closes #5965
2015-05-17 13:57:54 +02:00
Benjamin Neff
d74e20a790 fetch public posts when someone starts sharing with you
closes #5960
2015-05-16 13:54:01 +02:00
Benjamin Neff
30cc330747 fix empty searchable in hcard, parse empty as false
closes #5962
2015-05-16 12:48:33 +02:00
Benjamin Neff
c01fdb6e1c fix the url for the public-posts json
closes #5958
2015-05-16 03:44:31 +02:00
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip
closes #5956
2015-05-16 03:42:14 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
Jason Robinson
ce16a122fc Fix missing localization of inactive user removal warning emails.
Fixes #5950
2015-05-16 03:40:06 +02:00
Jason Robinson
aec2467e98 Fix inactive user removal not respecting configuration for daily limits
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.

closes #5953
2015-05-16 03:36:25 +02:00
goobertron
2668c487e7 Remove dupe line from en.yml [ci skip]
closes #5951
2015-05-12 14:20:03 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags
closes #5945
2015-05-12 04:00:07 +02:00
Dennis Schubert
1a4e3cef48 Mute ActiveRecord::RecordInvalid due to ignores
closes #5943
2015-05-10 14:26:21 +02:00
Dennis Schubert
32f95a860c We don't always have invalid record messages ... so log the exception message instead. 2015-05-10 14:25:50 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names
closes #5941
2015-05-10 02:00:30 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Steffen van Bergerem
59e57c013b Update jasmine-ajax
closes #5937
2015-05-10 01:59:17 +02:00
Dennis Schubert
6273c2959a Rescue from private objects sent to the public api
closes #5938
2015-05-10 00:10:12 +02:00
Dennis Schubert
915dee3c4b Mute some ActiveRecord::RecordNotUnique exceptions 2015-05-10 00:09:25 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person
closes #5936
2015-05-09 23:48:59 +02:00
Jonne Haß
60fb680572 bump hashie
closes #5925
2015-05-07 22:55:56 +02:00
Jonne Haß
729fc1a6bf bump sprockets-rails 2015-05-07 22:55:37 +02:00