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
Steffen van Bergerem
ade9b97215
Update backbonejs, switch to rails-assets source
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
b58226ba9a
Load comments in mobile view when clicking comment button
...
closes #7207
2017-01-11 02:43:15 +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
95ddae86c7
Bump autosize
2017-01-10 23:31:47 +01:00
Steffen van Bergerem
aeb6d2287b
Remove unused upload button css
...
closes #7271
2017-01-10 23:05:02 +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
Steffen van Bergerem
a11747a579
Merge branch 'next-minor' into develop
2017-01-07 03:05:13 +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
Benjamin Neff
b632155772
Merge branch 'next-minor' into develop
2017-01-04 02:33:00 +01:00
Dennis Schubert
8709d74c3e
Increase the spacing above and below post contents
...
closes #7267
2017-01-04 02:30:02 +01:00
flaburgan
03db9807d7
Remove Vines mention, fix #7262
...
closes #7264
2017-01-04 02:23:57 +01:00
Benjamin Neff
03ae48c820
Merge branch 'next-minor' into develop
2017-01-03 03:31:56 +01:00
flaburgan
747ea161bf
Fix year bg color on /notifications
...
closes #7263
2017-01-03 03:31:47 +01:00
Dennis Schubert
6a1386094a
Merge branch 'next-minor' into develop
2016-12-14 00:11:41 +01:00
Dennis Schubert
db97ff7a25
Merge branch 'master' into next-minor
2016-12-14 00:11:31 +01:00
Dennis Schubert
241c17a814
Merge branch 'release/0.6.2.0'
2016-12-14 00:10:57 +01:00
Dennis Schubert
f79a54fc6c
Merge branch 'next-minor' into develop
2016-12-13 18:51:47 +01:00
Dennis Schubert
a1331aa3b1
Merge branch 'release/0.6.2.0' into next-minor
2016-12-13 18:51:33 +01:00
Dennis Schubert
ea35061feb
updated 121 locale files [ci skip]
2016-12-13 18:51:19 +01:00
Dennis Schubert
52b7d6ed9e
updated 121 locale files [ci skip]
2016-12-13 18:49:44 +01:00
Benjamin Neff
fca13efdf2
Merge branch 'next-minor' into develop
2016-12-08 03:19:45 +01:00
Benjamin Neff
7ce3982b6d
Merge branch 'release/0.6.2.0' into next-minor
2016-12-08 03:19:23 +01:00
Flaburgan
f785de7484
Reformulate CSRF e-mail
...
closes #7241
2016-12-08 03:16:19 +01:00
Dennis Schubert
d74c182e6f
Merge branch 'next-minor' into develop
2016-12-04 20:14:16 +01:00
Dennis Schubert
991b047be7
Start 0.6.3.0 cycle
2016-12-04 20:12:00 +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
SansPseudoFix
61300dab59
CSRF mail
2016-12-04 20:09:45 +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
7bcd7cfd35
Merge pull request #7232 from svbergerem/fix-mentions-in-comments-migration
...
Fix mentions in comments migration on PostgreSQL
2016-11-30 00:07:14 +01:00
Steffen van Bergerem
154ea6515a
Fix mentions in comments migration on PostgreSQL
2016-11-29 23:36:42 +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
Benjamin Neff
4fb9d6ed11
Merge branch 'next-minor' into develop
2016-11-29 17:46:47 +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
