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

1333 commits

Author SHA1 Message Date
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions 
closes #7040
 2016-09-04 03:17:48 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments 
closes #7045
 2016-09-04 03:15:35 +02:00
Benjamin Neff
b3453c494e
make session-cookie HttpOnly 
closes #7041
 2016-09-04 03:06:15 +02:00
Benjamin Neff
5017bd9541
rewrite notifier template with haml 
closes #7054
 2016-09-04 01:44:15 +02:00
Steffen van Bergerem
33b064b8dc
Add changelog for #7039 [ci skip] 2016-09-01 21:50:19 +02:00
Dennis Schubert
0921cfb43e
Prepare 0.6.1.0 cycle 
[ci skip]
 2016-08-21 23:52:30 +02:00
Jonne Haß
33c8e029ee
add changelog entry for #6998 [ci skip] 2016-08-18 21:56:10 +02:00
Steffen van Bergerem
bcb34ecaa7
Fix a link in the changelog [ci skip] 2016-08-18 17:16:54 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions 
Fix conversations autoSuggest showing non-mutual contacts
 2016-08-18 13:36:27 +02:00
Jonne Haß
fedd378dcf
Merge pull request #6992 from SuperTux88/4491-fetch-mentioned-people 
fetch mentioned people if they don't exist locally yet
 2016-08-16 10:41:02 +02:00
Jonne Haß
c53393c5de
Merge pull request #6903 from CSammy/6152-tags-page-slow 
Improve /tag page performance.
 2016-08-15 14:09:59 +02:00
Jonne Haß
200486b6f1
Merge pull request #6984 from SuperTux88/6294-ignore-notifications 
Don't create notifications from ignored people
 2016-08-14 18:28:13 +02:00
Dennis Schubert
3942dca08f
Merge pull request #6972 from jhass/queue_migration 
Add rake task to move jobs from any legacy queue to the default queue
 2016-08-13 17:31:14 +02:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations 
Cleanup invitations
 2016-08-13 14:16:41 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2 
Comments expansion refactoring
 2016-08-12 23:46:22 +02:00
Steffen van Bergerem
bf6af404ee
Merge pull request #6551 from AugierLe42e/bootstrap-markdown 
Adding bootstrap-markdown editor
 2016-08-12 23:37:26 +02:00
Jonne Haß
8deef544dc
Merge pull request #6974 from svbergerem/empty-stream 
Add 'no posts yet' message to empty streams
 2016-08-12 14:11:27 +02:00
Jonne Haß
780c521bd1
Merge pull request #6973 from svbergerem/alert-accessibility 
Add role='alert' to alerts
 2016-08-12 14:10:25 +02:00
Jonne Haß
5afe582057
Add rake task to move jobs from any legacy queue to the default queue 2016-08-11 22:40:49 +02:00
Jonne Haß
47c6b4eff9
Merge branch 'stable' into develop 2016-08-11 21:34:55 +02:00
Jonne Haß
914fbcde0d
Merge branch 'master' into stable 2016-08-11 21:28:41 +02:00
Jonne Haß
0a77f045a3
bump to 0.5.10.2 2016-08-11 20:25:20 +02:00
Senya
bc95de72e4
Fix command in changelog [ci skip] 2016-08-11 14:16:16 +03:00
Steffen van Bergerem
db7ce50b6f
Fix links in Changelog [ci skip] 2016-08-11 03:08:11 +02:00
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