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

1309 commits

Author SHA1 Message Date
Jonne Haß
90abad0152 Merge pull request #6950 from cmrd-senya/consolidate-queues 
Consolidate queues
 2016-08-10 11:46:09 +02:00
Jason Robinson
78299c9e2f Consolidate amount of sidekiq queues from 13 to 5 
Sidekiq documentation says 'Sidekiq is not designed to work well with dozens of queues.'. Having the amount of queues we have at the moment brings no anyway.

Closes #5571
 2016-08-10 08:51:22 +00:00
Jonne Haß
8e887f884e
Merge pull request #6951 from svbergerem/contacts-search 
Modify search to include contacts
 2016-08-09 19:51:46 +02:00
Denys Kurets
ef729425b4
6776 remove unused routes 2016-08-09 10:00:51 +02:00
Steffen van Bergerem
89e6fd7ea5
Merge pull request #6942 from Flaburgan/ruby-2.3 
Recommend Ruby 2.3, keep Ruby 2.1 as supported
 2016-08-08 22:57:46 +02:00
Jonne Haß
ca2dd532af
Merge pull request #6940 from SuperTux88/cleanup-posts-table 
Cleanup posts table
 2016-08-08 20:53:24 +02:00
Jonne Haß
32174aa532
Merge pull request #6932 from SuperTux88/relayable-additional-fields 
Save relayable signature data
 2016-08-08 19:28:21 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title 
closes #6642
 2016-08-08 19:23:17 +02:00
Steffen van Bergerem
5f3e4fc358
Merge pull request #6926 from jhass/timeago_plurals 
Properly support pluralization in timeago strings
 2016-08-08 17:38:30 +02:00
Steffen van Bergerem
c065e19d5b
Merge pull request #6864 from cmrd-senya/6120-aspects-creation-ui 
Refactor  aspects membership dropdown to use handlebars template
 2016-08-08 17:26:11 +02:00
Flaburgan
3ff1c3748a Recommend Ruby 2.3, keep Ruby 2.1 as supported 2016-08-05 12:08:13 +02:00
Jonne Haß
58a355ed01
Expose Sidekiq dead job queue configuration options 
Set the default limit of dead jobs to 5k, which should equal to about 50M memory
usage in the worst case. Sidekiq's default is 10k. Set the expiration
timeout to 6 weeks, matching our minor release schedule. Sidekiq's
default is 6 months.

Given the new federation code stores the XML payload in the job
parameters, fine-tuning here can give more significant memory savings.
 2016-07-20 15:21:17 +02:00
Jonne Haß
66bc049f9b
Merge pull request #6922 from cmrd-senya/6547-adoption 
Refactored photo extraction
 2016-07-18 14:35:00 +02:00
Steffen van Bergerem
59fb227d95
Merge pull request #6914 from denschub/be-excellent 
Add 'Be excellent to each other!' to the sidebar
 2016-07-17 11:00:16 +02:00
Jonne Haß
8fcb66a425
Merge pull request #6910 from SaiVardhan/Issue#6850_private_message 
[Fix] #6850 Don't include subjects of private message
 2016-07-17 09:32:19 +02:00
Jonne Haß
3281f2a72d
Merge pull request #6921 from SuperTux88/cleanup-status_message 
Cleanup StatusMessage
 2016-07-17 09:28:34 +02:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions 
Filter mentions on status message creation
 2016-07-06 22:27:13 +02:00
Jonne Haß
5775647180
update changelog for #6905 [ci skip] 2016-07-06 01:58:32 +02:00
Dennis Schubert
7c6e7dbf0b
Merge branch 'stable' into develop 2016-06-28 22:06:35 +02:00
Dennis Schubert
8cd3f31da6
Merge branch 'master' into stable 2016-06-28 22:06:00 +02:00
Dennis Schubert
8421289e3b
Re-add mysql2 to the Gemfile.lock 2016-06-28 22:05:17 +02:00
Jonne Haß
54026f4a63
update changelog [ci skip] 2016-06-27 10:40:26 +02:00
Dennis Schubert
84ec00fa4d Merge pull request #6873 from SuperTux88/federation-gem-salmon 
Federation rewrite with diaspora_federation gem
 2016-06-26 07:01:40 +02:00
Dennis Schubert
68086fbf0b Merge branch 'stable' into develop 2016-06-20 05:24:49 +02:00
Dennis Schubert
962af9e2dd Start 0.5.11.0 cycle 2016-06-20 05:23:32 +02:00
Dennis Schubert
f1f7c41eda Remove unused Changelog headlines for 0.5.10.0 
[ci skip]
 2016-06-20 05:22:37 +02:00
Dennis Schubert
fb25718839 Merge pull request #6268 from svbergerem/redesign-default-haml 
Redesign default.haml
 2016-06-20 05:17:42 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop 2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly 
closes #6877
 2016-06-19 16:14:00 +02:00
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