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

8921 commits

Author SHA1 Message Date
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
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
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
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
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
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
Armando Lüscher
60d49eb423 Remove the duplicate "stream" container which already gets added in the "messages" partial. 
closes #7228
 2016-11-28 02:54:29 +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
Steffen van Bergerem
610700ffd5 Refactor conversations controller create 
closes #7224
 2016-11-26 02:22:07 +01:00
Justin Ramos
2ca42ea5e6
adding content_for(:javascript) 
closes #7209
 2016-11-25 15:56:31 +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
9556669761 Remove unused posts/photo view 2016-11-23 01:52:16 +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
8e345c0335 Add avatar fallback on tags page 
fixes #6969

closes #7198
 2016-11-22 02:43:32 +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
Justin Ramos
9aac486510
use shared partial for desktop and mobile application head 
closes #7194
 2016-11-18 16:40:23 +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
9bca03d5e9 Refactor ShareVisibilitesController 
closes #7196
 2016-11-18 02:10:26 +01:00
Steffen van Bergerem
75f95faebe Update typeahead.js, use the version from rails-assets.org 
closes #7192
 2016-11-18 02:05:32 +01:00
Justin Ramos
00ed1c9b39
check AppConfig.mail.enable? before displaying some view content 
closes #7190
 2016-11-17 22:52:18 +01:00
Justin Ramos
c7a0b053fa
fixing invitations modal visibility issue 
closes #7191
 2016-11-17 22:34:54 +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
7cd2232812 Only allow conversation creation in controller with mututal contacts 2016-11-14 03:27:15 +01:00