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

876 commits

Author SHA1 Message Date
Jonne Haß
4b2a43b005 Merge branch 'master' into stable 2015-06-16 21:40:18 +02:00
Jonne Haß
532f78b5a1 Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4 
This fixes CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225
 2015-06-16 21:33:16 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem 
regression from #6005

closes #6105
 2015-06-15 13:46:07 +02:00
Steffen van Bergerem
034fc5b183 Update markdown-it 
closes #6091
 2015-06-10 13:33:33 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable 
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
 2015-06-09 22:55:16 +02:00
Dennis Schubert
1aa802c07c Merge branch 'release/0.5.1.0-RC' into stable 2015-06-09 05:48:53 +02:00
Dennis Schubert
2837e58903 Remove listen note from the readme 
this is not included in 0.5.1.0.

[ci skip]
 2015-06-09 05:48:29 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar 
closes #6085
 2015-06-08 16:59:27 +02:00
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
Dennis Schubert
ebd12430ea Add note regarding production.server.listen changes 
[ci skip]
 2015-06-08 04:26:13 +02:00
Benjamin Neff
d42b5c128e update photos when received over public path 
closes #6082
 2015-06-08 04:18:31 +02:00
Benjamin Neff
97153ad08b update tests for new twitter client 
closes #6083
 2015-06-08 04:08:46 +02:00
Benjamin Neff
aa2297a8c0 retry receive share-visibility when failed while receiving parallel 
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126)

closes #6068
 2015-06-08 00:58:00 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
Benjamin Neff
735d692ac0 fix selected week on weekly stats page 
closes #6079
 2015-06-07 21:14:47 +02:00
Jonne Haß
6c71d9f257 Only strip text direction markers around hashtags for now 
Fixes #6067
 2015-06-06 15:23:12 +02:00
Benjamin Neff
27b4a44e4a replace Rails.logger with logging-logger 
closes #6041
 2015-06-04 04:17:15 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Jason Robinson
d2e0b3ceae Fix Facebook scopes for cross-posting 
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).

closes #6019 [ci skip]
 2015-06-02 02:47:20 +02:00
Benjamin Neff
b8a6af2742 add db migration to cleanup default avatar image-urls 
closes #6014
 2015-06-02 02:34:32 +02:00
Benjamin Neff
a7fa3eabcb Disable autocorrect/autocapitalize for the username 
and cleanup the code so it follows the code guidelines

closes #5955

closes #6028
 2015-06-02 00:44:47 +02:00
Steffen van Bergerem
35e75b3c64 Atom feed: set post title length to 50 and use configured pod name in the feed title 
closes #6020
 2015-06-01 04:55:27 +02:00
theworldbright
45a5e3d1c5 Change markdown-content hr style #5987 
The <hr> tag in the markdown-content was #eee,
and thus almost invisible. It has been changed to
$border-gray (currently #ddd) to be consistent
with the other <hr> tags.

Adjust markdown-content hr style further

The hr tag is now centered at 85% width. It also
adds a default vertical margin that is equivalent
to the 0.8em the paragraph tags provide.

Refactor scss for markdown-content hr

Closes #6016
 2015-05-31 20:39:55 +02:00
Benjamin Neff
76ca4fdc70 use image_url for the logo in mails 
closes #6013
 2015-05-31 01:49:38 +02:00
Steffen van Bergerem
fdad348898 Fix tag rendering in emails 
closes #6009
 2015-05-31 01:47:05 +02:00
Jonne Haß
ac52cef546 Only return the current_users participation for post interactions 
closes #6007
 2015-05-30 03:08:25 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194 
closes #6005
 2015-05-29 11:41:57 +02:00
Benjamin Neff
604ffb445a optimized sprites 
- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
 2015-05-29 11:39:30 +02:00
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
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil 
closes #5991
 2015-05-28 01:34:24 +02:00
Benjamin Neff
5655eead7c make the logrotation configurable 
closes #5994
 2015-05-28 01:26:48 +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
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
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
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
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
Jason Robinson
ce16a122fc Fix missing localization of inactive user removal warning emails. 
Fixes #5950
 2015-05-16 03:40:06 +02:00