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

4528 commits

Author SHA1 Message Date
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
Augier
f2fdaf1daf Use typeahead on conversations 2016-11-13 20:08:59 +01:00
Steffen van Bergerem
5269a0d3c0
Fix aspect membership view spec syntax 
Regression introduced in #7132
 2016-11-12 21:37:48 +01:00
Benjamin Neff
851c16d80c
Add setting for a custom changelog url. 
fixes #7073

closes #7166
 2016-11-06 02:41:42 +01:00
Benjamin Neff
57c0330535
Schedule a connection-check when receiving a message from an offline pod 
closes #7158
 2016-11-06 02:40:05 +01:00
Steffen van Bergerem
a73e1baaed Show spinner when loading comments 
closes #7170
 2016-11-03 22:50:03 +01:00
Steffen van Bergerem
e3b3da404f Fetch comments, likes and reshares separately 
Fixes #7165

closes #7167
 2016-11-02 23:02:32 +01:00
Steffen van Bergerem
98b345305e Remove unused jasmine fixture 2016-11-02 22:59:25 +01:00
Steffen van Bergerem
2ec45317a3 Add new JSON endpoint for reshares 2016-11-02 22:59:25 +01:00