Commit graph

1785 commits

Author SHA1 Message Date
Benjamin Neff
c130b78117
Merge branch 'master' into next-minor 2017-01-23 02:42:53 +01:00
Benjamin Neff
46ef3e65c4
updated 86 locale files [ci skip] 2017-01-23 02:09:19 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
closes #7290
2017-01-22 23:29:57 +01:00
Steffen van Bergerem
941118d7af Move formatting from locale to views
closes #7283
2017-01-15 23:42:03 +01:00
SansPseudoFix
0f60b9fb94
Switch reason and message
unify

rename and show full post on reports

Fix XSS issue

Unification

Style

Fix pronto

closes #7180
2017-01-15 04:04:18 +01:00
Steffen van Bergerem
b8d3323de0 Return error when unlike failed 2017-01-15 02:17:10 +01:00
Steffen van Bergerem
c9d49c89a6 Always show mobile reaction counts
fixes #5829
2017-01-11 02:43:06 +01:00
flaburgan
8e5d2f5c65
Add links to the aspects and followed tags page on mobile
closes #7265
2017-01-07 03:05:01 +01:00
Dennis Schubert
ea35061feb
updated 121 locale files [ci skip] 2016-12-13 18:51:19 +01:00
Flaburgan
f785de7484 Reformulate CSRF e-mail
closes #7241
2016-12-08 03:16:19 +01:00
Benjamin Neff
6c37171f9f
Change last sentence and fix specs
closes #7238
2016-12-04 20:10:13 +01:00
SansPseudoFix
61300dab59
CSRF mail 2016-12-04 20:09:45 +01:00
Steffen van Bergerem
8588844913 Remove unused photos.show.show_original_post translation
closes #7208
2016-11-23 01:52:23 +01:00
Steffen van Bergerem
0051d6a0b8 Move comment, like and reshare creation error translations
closes #7202
2016-11-22 03:54:56 +01:00
Steffen van Bergerem
6c5c865b15 Use error message from the server when reshare failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8078c60cee Refactor aspect membership error response handling with flash messages 2016-11-22 03:53:01 +01:00
Augier
af331bfb30
Add collection to app.views.NotificationDropdown and app.views.Notifications
closes #6952
2016-11-18 15:27:37 +01:00
Dennis Schubert
260cc23357
updated 29 locale files [ci skip] 2016-11-06 02:31:20 +01:00
hilkoc
b7791e6c9d Add user setting for default post visibility
fixes #4319

closes #7118
2016-10-26 02:48:11 +02:00
Benjamin Neff
1c1c9d6794
Link to diaspora* admin dashboard
closes #7130
2016-10-01 02:36:55 +02:00
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js 2016-09-30 00:32:46 +02:00
Benjamin Neff
14304f3620
Extract profile photo uploader to file 2016-09-28 21:59:08 +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
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link
closes #7061
2016-09-06 05:08:04 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails
closes #7050
2016-09-04 03:26:42 +02:00
Steffen van Bergerem
6ad9000f8c
Sign out users with wrong CSRF tokens
See http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf
2016-09-04 03:26:18 +02:00
Steffen van Bergerem
7f0ffb8b0a
Fix invitation link on people search page 2016-08-23 01:52:25 +02:00
Dennis Schubert
af9ab2355b
updated 116 locale files [ci skip] 2016-08-22 00:15:54 +02:00
Benjamin Neff
bc6c8a0598 disable registration with invite-code when invitations are closed
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
2016-08-13 13:51:28 +02:00
Benjamin Neff
2a553940d4 small design fixes for invites 2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a Cleanup legacy invitations from code
Fixes #5116
2016-08-13 01:47:27 +02:00
Steffen van Bergerem
1d58df13e3
Change 'no posts yet' message [ci skip] 2016-08-12 23:39:46 +02:00
augier
5c2e241106 Displaying the markdown editor on publisher 2016-08-12 23:08:41 +02:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Jonne Haß
7fa299b7ad Merge pull request #6959 from cmrd-senya/devise-upgrade
Upgrade devise to 4.2
2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Steffen van Bergerem
11f6ed2b9a
Fix community spotlight styles 2016-08-10 23:13:18 +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
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership
in order to support adding new aspect to a dropdown without full
page reload
2016-08-08 17:21:14 +03:00
Jonne Haß
734f332333
Properly support pluralization in timeago strings 2016-08-01 13:27:30 +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
Dennis Schubert
2d8c62fae3
Add 'Be excellent to each other!' to the sidebar 2016-07-17 10:47:08 +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
SaiVardhan
274104aac6 issue-6850 Don't include subjects of private messages in email notifications 2016-07-12 16:33:15 +05:30
Jonne Haß
70166fc16a
updated 150 locale files [ci skip] 2016-07-11 11:16:11 +02:00
Steffen van Bergerem
bef5241512
Remove unused translations from diaspora.yml, add missing ones 2016-07-05 23:34:31 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
715cb1bb87
Remove unused translations 2016-07-03 18:14:23 +02:00
Jakob Kramer
8d16270fcb
Remove unused strings from translation files 2016-07-03 10:18:08 +02:00
Steffen van Bergerem
d98574a351
Change 'Sign up' to 'Create account' 2016-06-20 23:27:38 +02:00