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

1280 commits

Author SHA1 Message Date
Dennis Schubert
eb1e1e1263 Merge pull request #6768 from svbergerem/poltergeist 
Use Poltergeist instead of Selenium
 2016-06-19 11:43:50 +02:00
Dennis Schubert
0db7252630
Merge pull request #6863 from SuperTux88/remove-REDISTOGO_URL-deprecation 
remove REDISTOGO_URL deprecation
 2016-06-16 02:52:54 +02:00
Dennis Schubert
520d80cc1a
Merge branch 'stable' into develop 2016-06-09 03:19:35 +02:00
Steffen van Bergerem
a14c61300e
Remove the publisher from the photos page 
closes #6851
 2016-06-09 03:17:52 +02:00
Jonne Haß
1891b9c61e
Merge branch 'stable' into develop 2016-06-07 14:05:41 +02:00
Jonne Haß
4c750c8784
Merge branch 'master' into stable 2016-06-07 14:04:22 +02:00
Jonne Haß
0bc8e54afd
Update Nokogiri to 1.6.8 
Which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,  addressing
a range of security issues.
See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
for more details.
 2016-06-07 13:51:33 +02:00
Dennis Schubert
1fc60a9f82 Merge branch 'stable' into develop 2016-05-09 01:00:42 +02:00
Dennis Schubert
6bc1419cbe Prepere 0.5.10.0 cycle 2016-05-09 00:59:58 +02:00
Dennis Schubert
53808847a2 Merge branch 'stable' into develop 2016-05-07 18:52:34 +02:00
Ralin Chimev
1773e3e35d Do not change notification timestamp when making it read or unread. 
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.

Fixes #6798.

closes #6821
 2016-05-07 18:52:27 +02:00
Dennis Schubert
230ec02ad7 Merge branch 'stable' into develop 2016-05-06 02:20:38 +02:00
sjain1107
4cd2f1d9c1 Add inviter diaspora-ID to the invite email #6796 
closes #6817
 2016-05-06 02:20:31 +02:00
Dennis Schubert
2131e3425a Merge pull request #6792 from Zauberstuhl/unicorn_killer 
Move unicorn_killer to Gemfile
 2016-05-06 02:13:07 +02:00
Dennis Schubert
fc97b654ab Merge pull request #6779 from Zauberstuhl/prosody_integration 
Configuration wrapper for Prosody
 2016-05-06 02:03:48 +02:00
Steffen van Bergerem
2263abdc82 Merge branch 'stable' into develop 2016-05-05 17:59:51 +02:00
Senya
ce6b1a3c0c Clear unused regex in mention.rb 
The REGEX is unused

closes #6810
 2016-05-05 17:59:37 +02:00
Dennis Schubert
e9fb29eba4 Merge pull request #6803 from Flaburgan/5396-fix-error-message-on-mobile-upload 
Fix error message on mobile image upload, close #5396
 2016-04-21 07:25:37 +02:00
Dennis Schubert
2b5f20ef93 Merge pull request #6784 from cmrd-senya/deletion-redirect-fixup 
Redirect to "/users/sign_in" after AccountDeletion
 2016-04-21 07:23:19 +02:00
Dennis Schubert
d6171e53c3 Merge pull request #6778 from Zauberstuhl/facebook_review_changes 
Changes for my successful facebook reviews
 2016-04-21 06:50:57 +02:00
Steffen van Bergerem
b0e608aa38 Merge branch 'stable' into develop 2016-04-13 22:18:52 +02:00
Steffen van Bergerem
61d27c3391 Add Changelog for #6782 [ci skip] 2016-04-13 22:17:56 +02:00
Steffen van Bergerem
413652fbf6 Add Changelog for #6782 [ci skip] 2016-04-13 21:39:39 +02:00
Dennis Schubert
f073a96b19 Merge pull request #6788 from svbergerem/improve-search-suggestions 
Improve search and mentions suggestions
 2016-04-08 08:19:07 +02:00
Dennis Schubert
1122dca5b8 Merge pull request #6777 from svbergerem/noscript 
Add noscript warning
 2016-03-31 22:11:07 +02:00
Dennis Schubert
7fc8f7de9b Merge branch 'stable' into develop 
[ci skip]
 2016-03-30 16:52:49 +02:00
Dennis Schubert
eba9e8f829 Prepare 0.5.9.0 cycle 
[ci skip]
 2016-03-30 16:52:00 +02:00
Dennis Schubert
0ea2767b3f Merge branch 'stable' into develop 2016-03-30 16:21:52 +02:00
Lukas Matt
a3ac1e3072 account_deletions get stuck while selecting participations 
Following query takes over 20 minutes and fills up the database:
SELECT * FROM participations WHERE author_id = XXXXX

On servers with a huge participations-table this is a serious
performance issue which is easily fixed by the author_id index

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-03-30 16:20:55 +02:00
Steffen van Bergerem
c8a8110cf1 Merge branch 'stable' into develop 2016-03-30 11:13:47 +02:00
Dennis Schubert
4617629098 Add spec for PeopleHelper#birthday_format 
closes #6738
 2016-03-30 11:13:35 +02:00
Steffen van Bergerem
be05f454e4 Merge pull request #6535 from Flaburgan/stream-modification 
Design of stream pages
 2016-03-23 01:28:55 +01:00
Dennis Schubert
49b71d3042 Merge pull request #6764 from svbergerem/unify-registration-session-form 
Unify mobile and desktop registration and session forms
 2016-03-22 12:43:51 +01:00
Jonne Haß
6bec0dbbb9 Merge branch 'stable' into develop 2016-03-21 14:04:33 +01:00
Benjamin Neff
d97448e552 remove ChromeFrame 
Google Chrome Frame was a plugin for Internet Explorer, but is no longer
supported. And it was included with http and not https which triggered a
warning on most pods.

Also set the minimum version to 9 to support #6557

closes #6751
 2016-03-21 14:04:24 +01:00
Dennis Schubert
446201b584 Merge branch 'stable' into develop 2016-03-18 07:24:44 +01:00
Benjamin Neff
6ea8cd546e don't change AppConfig.environment.url in jsxc_helper_spec 
closes #6748
 2016-03-18 07:24:40 +01:00
Dennis Schubert
aa873199f8 Merge branch 'stable' into develop 2016-03-08 22:56:02 +01:00
Dennis Schubert
4cb4ee0b5a Merge branch 'master' into stable 2016-03-08 22:55:51 +01:00
Dennis Schubert
352d732a37 Disable fetching of root posts for relayables 
since that could allow fetching spoofed/altered posts
thanks @supertux88
 2016-03-08 22:41:26 +01:00
Dennis Schubert
6270e22226 Start hotfix 0.5.7.1 2016-03-08 22:25:21 +01:00
Dennis Schubert
f2105d2fce Merge pull request #6741 from svbergerem/fix-typeahead-nonlatin-suggestions 
Fix typeahead suggestions with nonlatin chars
 2016-03-07 18:45:16 +01:00
Jonne Haß
39ae5e741e Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities 
Cleanup aspect visibilities
 2016-03-05 11:05:55 +01:00
Dennis Schubert
91d636b9f6 Merge pull request #6727 from SuperTux88/improve-pod-check 
Improve pod check
 2016-03-05 06:03:20 +01:00
Dennis Schubert
cc5a3997d2 Merge pull request #6728 from svbergerem/mentions-typeahead 
Rewrite mentions input using typeahead.js
 2016-03-05 04:55:38 +01:00
Benjamin Neff
7011f2961d Revert "Back out #6723 due to Postgres breakage" 
This reverts commit 84cfbd22fc.
 2016-03-04 14:01:31 +01:00
Dennis Schubert
84cfbd22fc Back out #6723 due to Postgres breakage 
This reverts commit 832a56134b, reversing
changes made to 75c3e6068c.
 2016-03-04 13:33:32 +01:00
Dennis Schubert
832a56134b Merge pull request #6723 from SuperTux88/fix-share_visibilities 
Link share visibilities directly with users
 2016-03-04 12:05:40 +01:00
Dennis Schubert
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +01:00