Benjamin Neff
af00d7c5c0
Merge branch 'next-minor' into develop
2017-01-22 23:30:42 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
...
closes #7290
2017-01-22 23:29:57 +01:00
Benjamin Neff
8d84865e82
Merge branch 'next-minor' into develop
2017-01-18 23:52:17 +01:00
Benjamin Neff
451e6087be
Merge branch 'release/0.6.3.0' into next-minor
2017-01-18 23:52:11 +01:00
Benjamin Neff
4e6a9aeb1e
Fallback to title if the reshare root was deleted
...
closes #7284
2017-01-18 23:51:42 +01:00
Benjamin Neff
7b7fbeffdc
Merge branch 'next-minor' into develop
2017-01-15 23:45:56 +01:00
Steffen van Bergerem
941118d7af
Move formatting from locale to views
...
closes #7283
2017-01-15 23:42:03 +01:00
Benjamin Neff
03f9147589
Merge branch 'next-minor' into develop
2017-01-15 02:19:10 +01:00
Steffen van Bergerem
d0e70ccd6a
Use new ajax error handling for like, unlike and comment failures
...
closes #7227
2017-01-15 02:19:02 +01:00
Steffen van Bergerem
bc5848fe9e
Use new ajax error handling for reshare failures
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
d609238ed4
Refactor mobile alerts for error responses, add them to container with fixed position
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
b8d3323de0
Return error when unlike failed
2017-01-15 02:17:10 +01:00
Benjamin Neff
c2a66966f2
Merge branch 'next-minor' into develop
2017-01-14 02:09:09 +01:00
Steffen van Bergerem
a341be7677
Bump markdown-it-diaspora-mention
2017-01-14 02:08:14 +01:00
Benjamin Neff
2bcca54330
Merge pull request #7242 from cmrd-senya/mentionable-route
...
new PostController#mentionable_in_comment action
2017-01-13 04:13:01 +01:00
cmrd Senya
1fb6040344
new PostController#mentionable_in_comment action
2017-01-13 04:47:50 +02:00
Benjamin Neff
479328d0e3
Merge branch 'next-minor' into develop
2017-01-13 02:49:18 +01:00
Steffen van Bergerem
6e7910b037
Deduplicate notification dropdown view
...
closes #7270
2017-01-13 02:49:08 +01:00
Steffen van Bergerem
abe7ef3d18
Update existing notifications in dropdown on fetch
...
When fetching notifications this merges existing notifications and changes
their appearance in the dropdown if the html or the unread status changed.
This doesn't update all notifications in the dropdown but only those that are
returned by the server.
Related to #7247 .
2017-01-13 02:47:37 +01:00
Benjamin Neff
ac136030c6
Merge branch 'next-minor' into develop
2017-01-11 02:43:41 +01:00
Steffen van Bergerem
c9d49c89a6
Always show mobile reaction counts
...
fixes #5829
2017-01-11 02:43:06 +01:00
Benjamin Neff
f01480a14c
Merge branch 'next-minor' into develop
2017-01-10 23:45:08 +01:00
Steffen van Bergerem
5efb4a912e
Prevent scroll to top when clicking 'mark all as read' in the notification dropdown
...
Fixes #7252
closes #7253
2017-01-10 23:41:35 +01:00
Steffen van Bergerem
fb06d03f49
Close modals at the end of each jasmine spec
...
closes #7246
2017-01-10 23:32:27 +01:00
Steffen van Bergerem
c164dac7a4
Merge branch 'next-minor' into develop
2017-01-07 18:32:15 +01:00
Frédéric Bolvin
7cc4b46d7e
Replaced fileuploader-custom with FineUploader
...
closes #7083
2017-01-07 18:32:08 +01:00
Dennis Schubert
2c68c1f142
Merge branch 'next-minor' into develop
2016-12-04 20:10:17 +01:00
Benjamin Neff
6c37171f9f
Change last sentence and fix specs
...
closes #7238
2016-12-04 20:10:13 +01:00
Benjamin Neff
da52627ab2
Merge branch 'next-minor' into develop
2016-12-02 03:31:45 +01:00
Senya
dd9bda24f4
Remove user_methods require line
...
No need to explicitly require user_methods.rb since it is already required in spec_helper.rb
closes #7236
2016-12-02 03:24:36 +01:00
Dennis Schubert
af1c992e01
Merge branch 'next-minor' into develop
2016-12-01 03:17:21 +01:00
cmrd Senya
31a31ecbe1
pass "state" parameter back to openid client
2016-12-01 03:16:50 +01:00
Benjamin Neff
bab503d960
Merge branch 'next-minor' into develop
2016-12-01 02:29:00 +01:00
Steffen van Bergerem
00ce187b07
Don't show browser notifications on pageload
...
closes #7211
2016-12-01 02:27:52 +01:00
Benjamin Neff
3b0c1020c0
Merge pull request #6818 from cmrd-senya/1851-mentions-in-comments.new
...
Mentions in comments backend changes
2016-11-29 19:31:43 +01:00
Senya
c547e66eb6
Remove a dangling "lola" object creation
...
It's never used and possibly was left unnoticed by some refactoring.
closes #7230
2016-11-29 17:46:37 +01:00
cmrd Senya
33ad411bbd
Mentions in comments backend changes
2016-11-28 15:56:56 +02:00
cmrd Senya
ef5751b808
Refactor mail workers to use common base
...
Introduce Workers::Mail::NotifierBase to be a base for all appropriate
mail workers to reduce code duplication
2016-11-28 15:35:46 +02:00
cmrd Senya
0ee34f8590
Remove the photo comment spec
...
This functionality is not something we support and it doesn't look
it will be reintroduced soon.
see discussion https://github.com/diaspora/diaspora/pull/6818#discussion_r70227392
2016-11-28 15:35:36 +02:00
Justin Ramos
fa71af71c1
require spec_helper in .rspec
...
closes #7223
2016-11-27 21:27:12 +01:00
Steffen van Bergerem
9f88850faf
Fix 500 on mobile commented and liked streams
...
Fixes #7218 , regression from #7036
closes #7219
2016-11-26 02:37:33 +01:00
Steffen van Bergerem
e186811aed
Remove unused contacts link methods
...
closes #7221
2016-11-26 02:25:29 +01:00
Justin Ramos
6c6f9bb982
only show community spotlight link on /contacts if it is enabled
...
closes #7213
2016-11-25 14:10:58 +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
f999624967
Use error message from the server when comment failed
2016-11-22 03:53:01 +01:00
Steffen van Bergerem
82e78d3ce8
Use error message from the server when like failed
2016-11-22 03:53:01 +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
Steffen van Bergerem
b645541d52
Update notifications when changing the stream
...
fixes #6473
closes #7199
2016-11-22 03:00:59 +01:00
Steffen van Bergerem
5660d2f4a8
Refactor comment creation in post interactions backbone model
...
closes #7186
2016-11-19 03:40:42 +01:00
