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 |
|
Benjamin Neff
|
c1e583cffd
|
Merge branch 'next-minor' into develop
|
2016-11-28 02:55:14 +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 |
|
Benjamin Neff
|
855b148ba5
|
Merge branch 'next-minor' into develop
|
2016-11-27 21:36:41 +01:00 |
|
Justin Ramos
|
fa71af71c1
|
require spec_helper in .rspec
closes #7223
|
2016-11-27 21:27:12 +01:00 |
|
Benjamin Neff
|
5c5ef38908
|
Merge branch 'next-minor' into develop
|
2016-11-26 02:38:55 +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 |
|
Benjamin Neff
|
34787043bb
|
Merge branch 'next-minor' into develop
|
2016-11-25 22:37:21 +01:00 |
|
Justin Ramos
|
3586fa6ae7
|
allowing for graceful unicorn restarts
closes #7217
|
2016-11-25 22:37:06 +01:00 |
|
Steffen van Bergerem
|
443d738aee
|
Merge branch 'next-minor' into develop
|
2016-11-25 15:56:39 +01:00 |
|
Justin Ramos
|
2ca42ea5e6
|
adding content_for(:javascript)
closes #7209
|
2016-11-25 15:56:31 +01:00 |
|
Steffen van Bergerem
|
365441ede2
|
Merge branch 'next-minor' into develop
|
2016-11-25 14:11:05 +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 |
|
Benjamin Neff
|
b6847f76b5
|
Merge branch 'next-minor' into develop
|
2016-11-24 23:30:24 +01:00 |
|
Justin Ramos
|
43b1632148
|
only require fog/aws
closes #7201
|
2016-11-24 23:14:49 +01:00 |
|
Benjamin Neff
|
edd3ddef52
|
Merge branch 'next-minor' into develop
|
2016-11-23 01:53:12 +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 |
|
Benjamin Neff
|
99b7229d5a
|
Merge branch 'next-minor' into develop
|
2016-11-22 03:55:12 +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 |
|
Benjamin Neff
|
12a2e312d9
|
Merge branch 'next-minor' into develop
|
2016-11-19 03:40:57 +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 |
|
Steffen van Bergerem
|
9ecbac3ee0
|
Merge branch 'next-minor' into develop
|
2016-11-18 16:40:46 +01:00 |
|
Justin Ramos
|
9aac486510
|
use shared partial for desktop and mobile application head
closes #7194
|
2016-11-18 16:40:23 +01:00 |
|
Steffen van Bergerem
|
8cd26054c8
|
Merge branch 'next-minor' into develop
|
2016-11-18 15:29:00 +01:00 |
|
Augier
|
af331bfb30
|
Add collection to app.views.NotificationDropdown and app.views.Notifications
closes #6952
|
2016-11-18 15:27:37 +01:00 |
|
Benjamin Neff
|
73d352920f
|
Merge branch 'next-minor' into develop
|
2016-11-18 02:14:51 +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
|
75f95faebe
|
Update typeahead.js, use the version from rails-assets.org
closes #7192
|
2016-11-18 02:05:32 +01:00 |
|
Steffen van Bergerem
|
f27769bcd2
|
Merge branch 'next-minor' into develop
|
2016-11-17 22:52:35 +01:00 |
|
Justin Ramos
|
00ed1c9b39
|
check AppConfig.mail.enable? before displaying some view content
closes #7190
|
2016-11-17 22:52:18 +01:00 |
|
Steffen van Bergerem
|
9b4f73dc77
|
Merge branch 'next-minor' into develop
|
2016-11-17 22:35:01 +01:00 |
|
Justin Ramos
|
c7a0b053fa
|
fixing invitations modal visibility issue
closes #7191
|
2016-11-17 22:34:54 +01:00 |
|
Benjamin Neff
|
b319e0caa2
|
Merge branch 'next-minor' into develop
|
2016-11-15 22:56:06 +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 |
|