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

1451 commits

Author SHA1 Message Date
Benjamin Neff
0dd98a5c13
Bump diaspora_federation 
closes #7145
 2016-10-27 02:26:11 +02:00
Steffen van Bergerem
f90812671c
Show error messages from server when aspect membership changes fail 
closes #7132
 2016-10-27 02:24:58 +02:00
hilkoc
b7791e6c9d Add user setting for default post visibility 
fixes #4319

closes #7118
 2016-10-26 02:48:11 +02:00
Steffen van Bergerem
74fff52e51 Fix message modal on profile page 
closes #7137

fixes #7136
 2016-10-26 00:51:41 +02:00
Benjamin Neff
ac08e9351b
Hide "Follow #tag" button on tag page if not logged in 
closes #7155
 2016-10-24 00:25:27 +02:00
Augier
8c90e5ac46
Search suggestion can be opened in a new tab + displays contact's hovercard 
closes #7134
 2016-10-18 15:37:23 +02:00
Benjamin Neff
0559932f5d
rename css classes for scss-lint 
closes #7148
 2016-10-18 15:05:28 +02:00
Muhannes
c5b133d3e8
added mobile buttons for streams 
Fixed sizes for drawer buttons

Added buttons for stream and public stream in mobile drawer

closes #7144
 2016-10-17 22:47:57 +02:00
Benjamin Neff
1c1c9d6794
Link to diaspora* admin dashboard 
closes #7130
 2016-10-01 02:36:55 +02:00
Benjamin Neff
ec8a49b338
Add settings for CSP to diaspora.yml 
closes #7128
 2016-09-30 02:11:32 +02:00
Steffen van Bergerem
35aa0badc5
Refactor stream shortcuts 
closes #7127
 2016-09-30 01:44:24 +02:00
Steffen van Bergerem
2a697c5d1f
Remove inbox.js from precompiled assets 
closes #7108
 2016-09-30 00:33:12 +02:00
Benjamin Neff
caf46fdcb9
Move initialization of mobile profile edit functions to file 
closes #7113
 2016-09-28 22:00:06 +02:00
Benjamin Neff
20cdbe262e
Link directly to the comment from notification mails 
closes #7124
 2016-09-25 23:07:53 +02:00
Dennis Schubert
dfb5b717b6 Add In-Reply-To and References headers to notification mails 
closes #7122
 2016-09-25 20:15:16 +02:00
Benjamin Neff
fe5811bb65
Don't federate to pods that are offline for more than two weeks 
Also fix a case where offline_since can be nil.

fixes #6220

closes #7120
 2016-09-25 03:20:41 +02:00
Steffen van Bergerem
709547860a
Refactor SPV post interactions 
closes #7089
 2016-09-25 03:07:02 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL 
closes #7066
 2016-09-25 02:58:56 +02:00
Benjamin Neff
fe071aa2a2
Deliver to each recipient only once 
closes #7071
 2016-09-20 04:25:04 +02:00
Dennis Schubert
78083afe38
Undo accidential dev->next-minor merge 
Turns out there is a difference between hg and git and I should not
switch that often.
 2016-09-20 02:04:04 +02:00
Dennis Schubert
f6e5fa1d13
Merge branch 'svbergerem-fix-bundler-require' into next-minor 2016-09-20 01:47:12 +02:00
Dennis Schubert
bc9cf77e8d
Merge branch 'master' into next-minor 2016-09-20 01:46:45 +02:00
Steffen van Bergerem
f6870c1c4d
Require installed optional groups with Bundler 2016-09-20 01:42:59 +02:00
Steffen van Bergerem
327cabe6fe Add number of unreviewed reports to admin dashboard and admin sidebar 
closes #7109
 2016-09-18 22:48:05 +02:00
Steffen van Bergerem
c0b9d125fd Use translation for NodeInfo services 
closes #7102
 2016-09-18 22:44:48 +02:00
Lance Gilbert
a9d77c6b1b Enable setting BOSH access protocol via chat configuration 
closes #7100
 2016-09-18 22:31:11 +02:00
Benjamin Neff
8ee92e34aa
Fix duplicate flash message on mobile profile edit 
closes #7107
 2016-09-18 13:44:37 +02:00
Benjamin Neff
5837919946
Fix link to comment on report-page 
closes #7105
 2016-09-18 13:41:44 +02:00
Steffen van Bergerem
dc1bc75303 Fix moving publisher on first click after page load 
closes #7094

fixes #7093
 2016-09-13 01:02:39 +02:00
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