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

1472 commits

Author SHA1 Message Date
Steffen van Bergerem
2c41485a61 Add charset to error pages 
closes #7092
 2016-09-13 01:01:08 +02:00
Steffen van Bergerem
2139f4b4c2 Use div instead of span for loader 
closes #7091
 2016-09-13 01:00:04 +02:00
Benjamin Neff
960f39b6ff Merge branch 'next-minor' into develop 2016-09-12 00:47:23 +02:00
Steffen van Bergerem
12e9e551d9 Remove blueimp gallery heading 
closes #7082
 2016-09-12 00:47:18 +02:00
Benjamin Neff
838982e92c Merge branch 'next-minor' into develop 2016-09-12 00:39:40 +02:00
Steffen van Bergerem
16af93f8a2 Prevent overflow of interaction avatars in the single post view 
closes #7070
 2016-09-12 00:39:28 +02:00
Benjamin Neff
b3b4ccd553 Merge branch 'next-minor' into develop 2016-09-11 23:06:27 +02:00
Steffen van Bergerem
4036a572af Remove whitespaces next to like link in stream 
closes #7088
 2016-09-11 23:06:21 +02:00
Steffen van Bergerem
eb0f948af5
Merge branch 'next-minor' into develop 2016-09-11 01:55:34 +02:00
Benjamin Neff
a5f538b9ae
Load jquery in the head on mobile 
Some pages need jquery in the head and instead of loading it twice on
these pages, it is better and easier to load it in the head on all
pages. It should be in the cache after the first load anyway.

closes #7086
 2016-09-11 01:55:25 +02:00
Benjamin Neff
4bf1ca6616 Merge branch 'next-minor' into develop 2016-09-11 00:21:28 +02:00
Steffen van Bergerem
546f909658 Fix 500 in html requests for post interactions 
closes #7085
 2016-09-11 00:21:13 +02:00
Steffen van Bergerem
580a068abf
Merge branch 'next-minor' into develop 2016-09-10 15:03:49 +02:00
Flaburgan
f0e70a3c6c
Fix wrong aria label 
closes #7068
 2016-09-10 15:03:39 +02:00
Steffen van Bergerem
3a58c233f4
Merge branch 'next-minor' into develop 2016-09-09 00:54:00 +02:00
cmrd Senya
ad596d8df1
Fix tags URLs in hovercards 
fixes #7074

closes #7075
 2016-09-09 00:53:21 +02:00
Dennis Schubert
99d8ca8414
Merge branch 'next-minor' into develop 2016-09-06 06:03:11 +02:00
Steffen van Bergerem
c6858d62a3
Add missing sidebar background in contacts tab 
closes #7064
 2016-09-06 06:03:06 +02:00
Dennis Schubert
09aef2f145
Merge branch 'next-minor' into develop 2016-09-06 05:08:09 +02:00
Steffen van Bergerem
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link 
closes #7061
 2016-09-06 05:08:04 +02:00
Benjamin Neff
a85c8e75f2 Merge branch 'next-minor' into develop 2016-09-04 03:55:17 +02:00
Steffen van Bergerem
4d51c02432 Add OpenGraph video support 
closes #7043
 2016-09-04 03:55:09 +02:00
Dennis Schubert
a87097785e
Merge branch 'next-minor' into develop 2016-09-04 03:31:46 +02:00
Benjamin Neff
8c58206e63
Fix links of more-button on mobile streams 
Fixes #6999

closes #7036
 2016-09-04 03:31:41 +02:00
Dennis Schubert
daff91ea20
Merge branch 'next-minor' into develop 2016-09-04 03:30:10 +02:00
Benjamin Neff
4fea926057
Only update interacted_at on new comments 
I got feedback from many users, that they don't understand how the "my
activity" stream is sorted, because they have posts on the top, but
don't see why. The user doesn't see if a like was added, and it is also
not imported for the user to see the post again then. And we have
notifications if someone likes a users own posts, so no need to move it on
top of the "my activity" stream here too.

closes #7030
 2016-09-04 03:29:59 +02:00
Dennis Schubert
37f8508153
Merge branch 'next-minor' into develop 2016-09-04 03:28:16 +02:00
Steffen van Bergerem
02ad431fb0
Fix conversations message overflow when posting code 
Related issue: https://github.com/twbs/bootstrap/issues/15958

closes #7055
 2016-09-04 03:28:12 +02:00
Dennis Schubert
fa99009d87
Merge branch 'next-minor' into develop 2016-09-04 03:26:47 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails 
closes #7050
 2016-09-04 03:26:42 +02:00
Dennis Schubert
75dcc1008e
Merge branch 'next-minor' into develop 2016-09-04 03:23:02 +02:00
Steffen van Bergerem
806de7e9d8
Exclude closed accounts from search 
closes #7042
 2016-09-04 03:22:58 +02:00
Dennis Schubert
cc8eff9efb
Merge branch 'next-minor' into develop 2016-09-04 03:17:53 +02:00
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions 
closes #7040
 2016-09-04 03:17:48 +02:00
Dennis Schubert
684d7d8312
Merge branch 'next-minor' into develop 2016-09-04 03:15:39 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments 
closes #7045
 2016-09-04 03:15:35 +02:00
Dennis Schubert
0a5df214f2
Merge branch 'next-minor' into develop 2016-09-04 03:06:20 +02:00
Benjamin Neff
b3453c494e
make session-cookie HttpOnly 
closes #7041
 2016-09-04 03:06:15 +02:00
Steffen van Bergerem
c7c9bb9628
Merge branch 'next-minor' into develop 2016-09-04 01:44:31 +02:00
Benjamin Neff
5017bd9541
rewrite notifier template with haml 
closes #7054
 2016-09-04 01:44:15 +02:00
Steffen van Bergerem
175d061032
Merge branch 'next-minor' into develop 2016-09-01 21:51:36 +02:00
Steffen van Bergerem
33b064b8dc
Add changelog for #7039 [ci skip] 2016-09-01 21:50:19 +02:00
Steffen van Bergerem
5c9978a72a
Merge pull request #7039 from lislis/4779-indicate-proper-way-to-report-bugs-in-sidebar 
Indicate proper way to report bugs in sidebar, close #4779
 2016-09-01 13:49:21 +02:00
Dennis Schubert
3f157bec35
Prepare 0.7.0.0 cycle 
[ci skip]
 2016-08-21 23:53:42 +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
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
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
Dennis Schubert
7c88fb7936 Merge pull request #6586 from cmrd-senya/drop-signatures 
Remove parent author signature for relayables from the DB
 2016-03-03 17:39:28 +01:00
Steffen van Bergerem
6bf5f0ee9e Add Changelog for #6621 [ci skip] 2016-03-02 22:03:47 +01:00
Dennis Schubert
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count 
Fix notification count change on contacts page
 2016-02-25 09:26:34 +01:00
Steffen van Bergerem
d9e3f3a734 Merge branch 'stable' into develop 2016-02-23 09:38:53 +01:00
Dennis Schubert
9f2e5b1868 Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications... 
closes #6711
 2016-02-23 09:38:34 +01:00
Dennis Schubert
dbdf352a6b Merge branch 'stable' into develop 2016-02-23 06:35:26 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page 
closes #6710
 2016-02-23 06:35:15 +01:00
Dennis Schubert
535057aca4 Merge branch 'stable' into develop 2016-02-21 04:26:25 +01:00