Benjamin Neff
cdb220be8d
Merge branch 'next-minor' into develop
2017-02-11 19:37:30 +01:00
Steffen van Bergerem
dc8d66520b
Use $link-color for text and $brand-primary for backgrounds/buttons
...
closes #7318
2017-02-11 19:37:07 +01:00
Steffen van Bergerem
dba8de5488
Use $blue only for reshare icon and $link-color everywhere else
2017-02-11 19:17:45 +01:00
Steffen van Bergerem
f1510ba2d6
Merge branch 'next-minor' into develop
2017-02-08 12:58:27 +01:00
Benjamin Neff
d9a1297271
Refactor PublisherHelper and move publisher_open? method
...
closes #7311
2017-02-08 12:58:13 +01:00
Benjamin Neff
8ebf9c4a4c
Move publisher methods to PublisherHelper and check public publisher flag
...
This makes the #newhere post public again.
2017-02-08 12:56:34 +01:00
Dennis Schubert
63077bfeaf
Merge branch 'next-minor' into develop
2017-02-05 10:34:48 +01:00
Steffen van Bergerem
690bbd9db3
Link to community guidelines from left navbar
...
closes #7298
2017-02-05 10:34:44 +01:00
Benjamin Neff
af00d7c5c0
Merge branch 'next-minor' into develop
2017-01-22 23:30:42 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
...
closes #7290
2017-01-22 23:29:57 +01:00
Benjamin Neff
8d84865e82
Merge branch 'next-minor' into develop
2017-01-18 23:52:17 +01:00
Benjamin Neff
451e6087be
Merge branch 'release/0.6.3.0' into next-minor
2017-01-18 23:52:11 +01:00
Benjamin Neff
4e6a9aeb1e
Fallback to title if the reshare root was deleted
...
closes #7284
2017-01-18 23:51:42 +01:00
Benjamin Neff
7b7fbeffdc
Merge branch 'next-minor' into develop
2017-01-15 23:45:56 +01:00
Steffen van Bergerem
941118d7af
Move formatting from locale to views
...
closes #7283
2017-01-15 23:42:03 +01:00
Steffen van Bergerem
bd0210a181
Remove chartbeat and mixpanel support
2017-01-15 13:30:54 +01:00
Steffen van Bergerem
eb8d9809ff
Merge branch 'next-minor' into develop
2017-01-15 04:04:31 +01:00
SansPseudoFix
0f60b9fb94
Switch reason and message
...
unify
rename and show full post on reports
Fix XSS issue
Unification
Style
Fix pronto
closes #7180
2017-01-15 04:04:18 +01:00
Benjamin Neff
03f9147589
Merge branch 'next-minor' into develop
2017-01-15 02:19:10 +01:00
Steffen van Bergerem
d0e70ccd6a
Use new ajax error handling for like, unlike and comment failures
...
closes #7227
2017-01-15 02:19:02 +01:00
Steffen van Bergerem
bc5848fe9e
Use new ajax error handling for reshare failures
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
d609238ed4
Refactor mobile alerts for error responses, add them to container with fixed position
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
b8d3323de0
Return error when unlike failed
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
de789267fc
Remove id selectors for mobile photo show page
...
closes #7279
2017-01-15 02:03:00 +01:00
Dennis Schubert
00193a8866
Merge branch 'next-minor' into develop
2017-01-15 00:11:18 +01:00
Benjamin Neff
f671bebd04
Fix background on mobile photo upload with dark theme
...
closes #7278
2017-01-15 00:11:07 +01:00
Benjamin Neff
0c0b618a8b
Fix background on mobile photo page with dark theme
2017-01-15 00:09:50 +01:00
Benjamin Neff
66e3cdb07e
Merge branch 'next-minor' into develop
2017-01-14 03:22:36 +01:00
Steffen van Bergerem
a290c432d8
Fix link to post on mobile photo page
...
closes #7274
2017-01-14 03:21:37 +01:00
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
Steffen van Bergerem
2b6465ef25
Use !== instead of localeCompare when removing conversation recipients
2016-11-13 20:08:59 +01:00
Augier
f2fdaf1daf
Use typeahead on conversations
2016-11-13 20:08:59 +01:00
Dennis Schubert
b3e5bfdafd
Set the hidden mention to transparent, not white.
2016-11-06 03:06:50 +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
Benjamin Neff
08282cea01
Add dark theme
...
Also renamed "Original Dark" to "Original Gray", because it isn't "dark".
closes #7152
2016-11-06 02:34:11 +01:00
Benjamin Neff
1c81c1e3ec
Refactor colors for better themeability
2016-11-06 02:33:43 +01:00
Steffen van Bergerem
a73e1baaed
Show spinner when loading comments
...
closes #7170
2016-11-03 22:50:03 +01:00
Steffen van Bergerem
951149dd24
Properly format JSON for reshares to hide 'reshare' button on already reshared posts
...
closes #7169
fixes #4816 and #6594
2016-11-03 22:44:12 +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
2ec45317a3
Add new JSON endpoint for reshares
2016-11-02 22:59:25 +01:00
Dennis Schubert
b78ef83c23
Merge branch 'release/0.6.1.0' into next-minor
2016-10-30 00:15:12 +02:00
Benjamin Neff
be3b50295c
Use default visibility also for bookmarklet
2016-10-30 00:13:03 +02:00
Benjamin Neff
433d952eb5
Fix tag page when default aspect is "public" or a single aspect
...
fixes #7161
2016-10-30 00:12:12 +02:00
Benjamin Neff
d421e42ddb
Remove ability to authenticate with auth_token on the frontend
...
Remove devise-token_authenticatable gem and only generate a token to be
used by the chat.
2016-10-28 00:36:14 +02:00
Benjamin Neff
16cd4752cb
Move auth_token to users controller
...
This token is only used for the chat, it isn't an official API.
2016-10-28 00:36:14 +02:00
Benjamin Neff
0dd98a5c13
Bump diaspora_federation
...
closes #7145
2016-10-27 02:26:11 +02:00
Steffen van Bergerem
f90812671c
Show error messages from server when aspect membership changes fail
...
closes #7132
2016-10-27 02:24:58 +02:00
Steffen van Bergerem
3bea40b248
Refactor conversations creation
...
closes #7131
2016-10-27 02:23:35 +02:00
Steffen van Bergerem
5c24714245
Fix mobile conversation alerts
2016-10-27 02:23:26 +02:00
Steffen van Bergerem
0c995eb629
Add JavaScript for mobile alerts
2016-10-27 02:23:26 +02:00
hilkoc
b7791e6c9d
Add user setting for default post visibility
...
fixes #4319
closes #7118
2016-10-26 02:48:11 +02:00
Steffen van Bergerem
74fff52e51
Fix message modal on profile page
...
closes #7137
fixes #7136
2016-10-26 00:51:41 +02:00
Benjamin Neff
ac08e9351b
Hide "Follow #tag" button on tag page if not logged in
...
closes #7155
2016-10-24 00:25:27 +02:00
Augier
8c90e5ac46
Search suggestion can be opened in a new tab + displays contact's hovercard
...
closes #7134
2016-10-18 15:37:23 +02:00
Benjamin Neff
0559932f5d
rename css classes for scss-lint
...
closes #7148
2016-10-18 15:05:28 +02:00
Benjamin Neff
4112192d95
fix avatar size on privacy page for ignored people
2016-10-18 15:04:46 +02:00
Muhannes
c5b133d3e8
added mobile buttons for streams
...
Fixed sizes for drawer buttons
Added buttons for stream and public stream in mobile drawer
closes #7144
2016-10-17 22:47:57 +02:00
cmrd Senya
cdcf2d747e
Override forgery settings in controllers
...
ClientsController and TokenEndpointController are called from the outside,
so CSRF verification prevents them from normal operation.
closes #7062
2016-10-01 10:24:15 +02:00
Benjamin Neff
1c1c9d6794
Link to diaspora* admin dashboard
...
closes #7130
2016-10-01 02:36:55 +02:00
Steffen van Bergerem
471af747b1
Remove extra padding from comment form in the stream
...
closes #7133
2016-10-01 02:27:44 +02:00
Steffen van Bergerem
2a31c2a6db
Unify new conversation margins
2016-10-01 02:27:19 +02:00
Benjamin Neff
6ec0fd4b9f
Add nonce to javascript tags
2016-09-30 02:10:37 +02:00
Steffen van Bergerem
35aa0badc5
Refactor stream shortcuts
...
closes #7127
2016-09-30 01:44:24 +02:00
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js
2016-09-30 00:32:46 +02:00
Benjamin Neff
caf46fdcb9
Move initialization of mobile profile edit functions to file
...
closes #7113
2016-09-28 22:00:06 +02:00
Benjamin Neff
fccabf9983
Extract mobile bookmarklet JS to file
2016-09-28 21:59:08 +02:00
Benjamin Neff
459ebffa6e
Start background search with gon
2016-09-28 21:59:08 +02:00
Benjamin Neff
b8c76a3317
Trigger getting started with backbone
2016-09-28 21:59:08 +02:00
Benjamin Neff
14304f3620
Extract profile photo uploader to file
2016-09-28 21:59:08 +02:00
Benjamin Neff
07a4925f3b
Extract tags autocompletion JS to file
2016-09-28 21:59:08 +02:00
Benjamin Neff
20cdbe262e
Link directly to the comment from notification mails
...
closes #7124
2016-09-25 23:07:53 +02:00
Dennis Schubert
dfb5b717b6
Add In-Reply-To and References headers to notification mails
...
closes #7122
2016-09-25 20:15:16 +02:00
Benjamin Neff
89a6379edd
Cleanup unused variables from color themes
...
closes #7121
2016-09-25 03:26:22 +02:00
Benjamin Neff
fe5811bb65
Don't federate to pods that are offline for more than two weeks
...
Also fix a case where offline_since can be nil.
fixes #6220
closes #7120
2016-09-25 03:20:41 +02:00
Augier
a37d9d532b
Fix some pronto remarks
...
closes #7119
2016-09-25 03:12:31 +02:00
Augier
523f1e848e
Replace .stream_element by .stream-element
2016-09-25 03:12:28 +02:00
Steffen van Bergerem
709547860a
Refactor SPV post interactions
...
closes #7089
2016-09-25 03:07:02 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL
...
closes #7066
2016-09-25 02:58:56 +02:00
Steffen van Bergerem
ffb442266f
Remove custom typeahead mouse events
...
closes #7096
2016-09-20 04:29:43 +02:00
Benjamin Neff
3f2586bc6f
Create share visibilities for photos attached to a private post
...
Also fixed the "fix public photos"-migration, because it didn't work
with migration-models :/
fixes #6177
2016-09-20 04:24:37 +02:00
Steffen van Bergerem
327cabe6fe
Add number of unreviewed reports to admin dashboard and admin sidebar
...
closes #7109
2016-09-18 22:48:05 +02:00
Steffen van Bergerem
c0b9d125fd
Use translation for NodeInfo services
...
closes #7102
2016-09-18 22:44:48 +02:00
Lance Gilbert
a9d77c6b1b
Enable setting BOSH access protocol via chat configuration
...
closes #7100
2016-09-18 22:31:11 +02:00
Benjamin Neff
8ee92e34aa
Fix duplicate flash message on mobile profile edit
...
closes #7107
2016-09-18 13:44:37 +02:00
Benjamin Neff
5837919946
Fix link to comment on report-page
...
closes #7105
2016-09-18 13:41:44 +02:00
Lukas Matt
9c93691b8a
bump diaspora_jsxc to v0.1.5-develop.7
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #7095
2016-09-18 13:35:45 +02:00
Steffen van Bergerem
dc1bc75303
Fix moving publisher on first click after page load
...
closes #7094
fixes #7093
2016-09-13 01:02:39 +02:00
Steffen van Bergerem
2c41485a61
Add charset to error pages
...
closes #7092
2016-09-13 01:01:08 +02:00
Steffen van Bergerem
2139f4b4c2
Use div instead of span for loader
...
closes #7091
2016-09-13 01:00:04 +02:00
Steffen van Bergerem
12e9e551d9
Remove blueimp gallery heading
...
closes #7082
2016-09-12 00:47:18 +02:00
Steffen van Bergerem
16af93f8a2
Prevent overflow of interaction avatars in the single post view
...
closes #7070
2016-09-12 00:39:28 +02:00
Steffen van Bergerem
521468986f
Remove remotipart gem and remotipart photo uploads
...
closes #7076
2016-09-12 00:34:44 +02:00
Steffen van Bergerem
4036a572af
Remove whitespaces next to like link in stream
...
closes #7088
2016-09-11 23:06:21 +02:00
Benjamin Neff
a5f538b9ae
Load jquery in the head on mobile
...
Some pages need jquery in the head and instead of loading it twice on
these pages, it is better and easier to load it in the head on all
pages. It should be in the cache after the first load anyway.
closes #7086
2016-09-11 01:55:25 +02:00
Steffen van Bergerem
546f909658
Fix 500 in html requests for post interactions
...
closes #7085
2016-09-11 00:21:13 +02:00
Flaburgan
f0e70a3c6c
Fix wrong aria label
...
closes #7068
2016-09-10 15:03:39 +02:00
Flaburgan
faf450e57d
Don't use divs inside h3
2016-09-10 15:00:50 +02:00
Flaburgan
2b6bb549c2
autocapitalize: off is deprecated since iOS 5
2016-09-10 15:00:50 +02:00
Flaburgan
abb51abbc3
Remove old charset spec
2016-09-10 15:00:50 +02:00
Steffen van Bergerem
1e2ae69bcd
Add missing sidebar background in contacts tab
...
closes #7064
2016-09-09 01:08:14 +02:00
