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

18352 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Frédéric Bolvin
7cc4b46d7e
Replaced fileuploader-custom with FineUploader 
closes #7083
 2017-01-07 18:32:08 +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
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
flaburgan
747ea161bf Fix year bg color on /notifications 
closes #7263
 2017-01-03 03:31:47 +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
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
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
991b047be7
Start 0.6.3.0 cycle 2016-12-04 20:12:00 +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
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
cmrd Senya
31a31ecbe1
pass "state" parameter back to openid client 2016-12-01 03:16:50 +01:00
Steffen van Bergerem
00ce187b07 Don't show browser notifications on pageload 
closes #7211
 2016-12-01 02:27:52 +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
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
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
ab0a769e9a Add help page cuke 
closes #7222
 2016-11-26 02:33:44 +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
3586fa6ae7 allowing for graceful unicorn restarts 
closes #7217
 2016-11-25 22:37:06 +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
Justin Ramos
43b1632148 only require fog/aws 
closes #7201
 2016-11-24 23:14:49 +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
9556669761 Remove unused posts/photo view 2016-11-23 01:52:16 +01:00
Steffen van Bergerem
c765909914 Fix notification cukes 
closes #7210
 2016-11-23 01:50:38 +01:00
Steffen van Bergerem
e040002172 Move some custom web steps to notifications steps 2016-11-23 01:49:38 +01:00
Steffen van Bergerem
d3faed74eb Remove deprecated capybara 'parent' call 2016-11-23 01:49:38 +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