Steffen van Bergerem
612455d41f
Bump faraday and twitter
...
closes #7348
2017-03-04 22:10:23 +01:00
Benjamin Neff
e1bf447aad
Merge branch 'next-minor' into develop
2017-03-04 21:08:18 +01:00
Steffen van Bergerem
12deda1429
Change regexp for hashtags
...
Fixes #5765 , fixes #5815 , supersedes #6099 .
closes #7350
2017-03-04 21:08:11 +01:00
Benjamin Neff
ec2c4a8564
Merge branch 'next-minor' into develop
2017-02-18 23:00:59 +01:00
Steffen van Bergerem
e3c9e9c9f1
Improve comment service spec for limited post the user can't see
...
closes #7337
2017-02-18 23:00:49 +01:00
Steffen van Bergerem
436934e890
Refactor reshares controller using reshare service
2017-02-18 22:59:38 +01:00
Steffen van Bergerem
44b616eda8
Add reshare service
2017-02-18 22:59:38 +01:00
Steffen van Bergerem
e74b524e8f
Refactor likes index route
2017-02-18 22:59:37 +01:00
Steffen van Bergerem
2772cb6e0c
Refactor likes controller using like service
2017-02-18 22:59:37 +01:00
Steffen van Bergerem
f93124863f
Add like service
2017-02-18 22:59:33 +01:00
Benjamin Neff
3d95642aca
Fix receiving multiple mentioned-in-comment notifications
...
When somebody commented multiple times and is mentioned in another
comment afterwards, the person received multiple notifications.
2017-02-16 03:09:40 +01:00
Benjamin Neff
eac8c7572c
Remove unused From headers
...
It is already added in the default_headers
2017-02-16 03:09:39 +01:00
Benjamin Neff
97c351c7b4
Add In-Reply-To and References header to mentioned in comment mail
2017-02-16 02:47:35 +01:00
Benjamin Neff
f1f1d09944
Merge pull request #7302 from svbergerem/simplify-mentions-publisher
...
Simplify mentions in the publisher
2017-02-15 03:15:01 +01:00
Benjamin Neff
3ef98f50ee
Merge pull request #7328 from svbergerem/use-new-mention-syntax-in-specs
...
Use new mention syntax in specs
2017-02-13 23:19:32 +01:00
Steffen van Bergerem
ab0a4606e2
Use new mention syntax in specs
2017-02-13 21:56:05 +01:00
Benjamin Neff
5c444e62be
Add @ before mentions for mobile and notifications
...
fixes #7269
2017-02-12 20:10:36 +01:00
Steffen van Bergerem
a6e6e6de91
Refactor publisher mentions backbone view
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
b23debf0b6
Refactor publisher backbone view
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
9217df43cd
Only update mentions in publisher before opening suggestions or preview
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
90b379b110
Drop useless data attribute for message text in publisher
2017-02-12 18:36:26 +01:00
Steffen van Bergerem
c4b6b9534c
No more fake text in the publisher
2017-02-12 18:36:26 +01:00
Steffen van Bergerem
a04f32adce
Drop mentions box in the publisher
2017-02-12 18:31:37 +01:00
Steffen van Bergerem
b3c412d38f
Display mention syntax in publisher instead of username
2017-02-12 18:31:36 +01:00
Steffen van Bergerem
408645cccc
Use new mention syntax in the publisher
2017-02-12 18:31:36 +01:00
Steffen van Bergerem
f1510ba2d6
Merge branch 'next-minor' into develop
2017-02-08 12:58:27 +01:00
Benjamin Neff
8ebf9c4a4c
Move publisher methods to PublisherHelper and check public publisher flag
...
This makes the #newhere post public again.
2017-02-08 12:56:34 +01:00
Benjamin Neff
2d8d0255dd
Improve handling with new mention syntax without name
...
* fallback to diaspora ID when person is not found
* fix filter_people when the person is not found
* write some more tests
2017-01-31 20:56:22 +01:00
Benjamin Neff
84e2a131cf
Remove { and } from the name when backporting mentions
...
Because } is not compatible with the regex.
2017-01-31 20:56:21 +01:00
Benjamin Neff
0e89d60117
Use name of mentioned person in plain text
2017-01-29 03:06:26 +01:00
Benjamin Neff
322f92110a
Backport new mention syntax to old syntax for backward compatibility
...
See #7276
2017-01-29 03:06:26 +01:00
Benjamin Neff
a0d200d209
Update regex for new mention syntax
...
See #7276
2017-01-29 03:06:26 +01:00
Steffen van Bergerem
2aa91e0b62
Merge branch 'next-minor' into develop
2017-01-28 18:04:21 +01:00
Senya
302ee795b6
Fix a jasmine test issue
...
The issue from a jasmine spec introduced by #7227 caused the testsuite that runs in a browser to be redirected out of the jasmine runner and therefore not finished.
closes #7299
2017-01-28 18:04:01 +01:00
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
Steffen van Bergerem
ed5f218559
Only clear comment textarea when comment submission was successful
...
fixes #5094
2016-11-19 03:40:29 +01:00
Augier
af331bfb30
Add collection to app.views.NotificationDropdown and app.views.Notifications
...
closes #6952
2016-11-18 15:27:37 +01:00
Steffen van Bergerem
9b72527f3e
Refactor conversations controller creation specs
...
closes #7197
2016-11-18 02:14:18 +01:00
Steffen van Bergerem
9bca03d5e9
Refactor ShareVisibilitesController
...
closes #7196
2016-11-18 02:10:26 +01:00
Steffen van Bergerem
37b34237b9
Force jasmine fails on syntax errors
...
closes #7185
2016-11-15 22:50:17 +01:00
Steffen van Bergerem
cdce25374f
Reduce i18n.load side effects
...
closes #7184
2016-11-15 22:46:06 +01:00
Steffen van Bergerem
a951c40ba0
Only reload profile header when changing aspect memberships
...
closes #7183
fixes #7072
2016-11-15 22:37:39 +01:00
Steffen van Bergerem
3930069e67
Leave help view spec with the default locale
2016-11-15 22:36:06 +01:00
Steffen van Bergerem
1863137161
Use string-direction gem for rtl detection
...
closes #7181
2016-11-15 22:33:56 +01:00
Steffen van Bergerem
457cf2aafb
Fix deprecation warnings in conversations controller spec
...
closes #7187
2016-11-14 03:27:55 +01:00
Steffen van Bergerem
7cd2232812
Only allow conversation creation in controller with mututal contacts
2016-11-14 03:27:15 +01:00
Steffen van Bergerem
117b17e25e
Remove unused conversations modal fixture
...
closes #7129
2016-11-13 20:11:34 +01:00
Steffen van Bergerem
8983554f94
Improve profile header jasmine test
...
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
cbe3ca5cf6
Improve conversations form jasmine test
...
* test that tag element are removed when clicking the tag's remove button
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
4c86b64532
Improve contacts page jasmine test
...
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
9cbadec659
Move 'XSS via name parameter' to mobile conversation specs
...
because the desktop view doesn't use the name parameter anymore
2016-11-13 20:08:59 +01:00
