cmrd Senya
87ed561d45
bump rails-timeago
...
Here we also set autoDispose to false. This is an option that was introduced
sometime after our last bump. Default is true and it disposes timeago object
if it is not in DOM. But that is the way we initialize timeago objects, therefore
if we have autoDispose=true then they will be disposed before they inserted in DOM.
So by using autoDispose=false we enforce previous behavior that worked fine for us.
2017-05-03 02:08:50 +02:00
Benjamin Neff
caaea50cf6
Merge branch 'next-minor' into develop
2017-04-26 22:18:02 +02:00
pskosinski
afef279aff
Fix untranslatable photo upload button's hover text
...
closes #7429
fixes #7427
2017-04-26 22:17:44 +02:00
Benjamin Neff
e91a0a57a3
Merge branch 'next-minor' into develop
2017-04-08 00:00:56 +02:00
Steffen van Bergerem
3971a24d68
Add avatar fallback for avatar next to publisher
...
closes #7414
2017-04-08 00:00:45 +02:00
Steffen van Bergerem
bf105db297
Use setupAvatarFallback in tags and notification dropdown view
2017-04-08 00:00:12 +02:00
Steffen van Bergerem
bcb75e3082
Add avatar fallback for conversations view
...
Fixes #4991
2017-04-08 00:00:12 +02:00
Steffen van Bergerem
1c1af74e9f
Add avatar fallback for typeahead suggestions
2017-04-07 23:59:58 +02:00
Steffen van Bergerem
82629c5979
Merge branch 'next-minor' into develop
2017-04-06 14:10:31 +02:00
Steffen van Bergerem
791e74104e
Fix taggable path in text formatter comment [ci skip]
2017-04-06 14:10:12 +02:00
Steffen van Bergerem
c94bac3cf9
Return 406 instead of 500 for statistics.json
...
Fixes #7406
2017-03-30 23:17:58 +02:00
Dennis Schubert
ec6a6d5138
Merge branch 'next-minor' into develop
2017-03-28 06:42:53 +02:00
Waithamai
38450eacea
Added spacing between list items fixes #7400
...
closes #7401
2017-03-28 06:42:43 +02:00
Dennis Schubert
efdfa749a7
Merge branch 'next-minor' into develop
...
closes #7398
2017-03-28 01:48:35 +02:00
Steffen van Bergerem
7feed3545c
Create mention success flash message with JavaScript
2017-03-28 01:46:30 +02:00
Steffen van Bergerem
e8ee74ef87
Remove statistics.json
2017-03-27 15:54:34 +02:00
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop
2017-03-27 00:04:53 +02:00
Steffen van Bergerem
4a56c0465c
Remove outdated rtl styles
...
These lines might have been necessary some time ago but now they are making things worse.
closes #7374
2017-03-27 00:04:38 +02:00
Steffen van Bergerem
2c53c2941e
Remove unused rtl styles
2017-03-27 00:03:06 +02:00
Steffen van Bergerem
d59ede46df
Remove styles for removed elements
2017-03-27 00:03:06 +02:00
Steffen van Bergerem
4a944c5ab4
Use small avatar in the person json
...
closes #7376
2017-03-27 00:02:10 +02:00
Steffen van Bergerem
13a44be306
Reduce size of conversation recipients in conversation form
...
Fixes #7321 .
2017-03-27 00:01:29 +02:00
Steffen van Bergerem
6f3c61d8f2
Increase maximal height of large thumbnail
...
Fixes #6248 , supersedes #6244 .
closes #7383
2017-03-27 00:00:41 +02:00
Steffen van Bergerem
8a98cd4517
Refactor destroyModel function in base view
...
closes #7385
2017-03-26 23:53:37 +02:00
Steffen van Bergerem
3ce4bba383
Only remove post from stream after successful response
...
Pass destroyModel from post control view to post view
and don't listen to the remove event in the post view
anymore. The `remove` function will be called from the
base view.
Fixes #5445
2017-03-26 23:50:48 +02:00
Benjamin Neff
04e653bd69
Merge branch 'next-minor' into develop
2017-03-26 04:15:19 +02:00
Steffen van Bergerem
aa55a7a023
Remove custom jquery input event
...
closes #7371
2017-03-26 04:14:59 +02:00
Benjamin Neff
a07bd94ec6
Merge pull request #7389 from svbergerem/fix-comment-mentions-spacing
...
Fix comment mentions spacing
2017-03-26 04:06:34 +02:00
Benjamin Neff
d04a553ae2
Merge pull request #7380 from svbergerem/refactor-mentions-css
...
Refactor mentions-input-box css
2017-03-26 04:04:56 +02:00
Benjamin Neff
af0a5e32a1
Merge pull request #7369 from svbergerem/color-themes-i18n
...
i18n for color themes
2017-03-26 03:12:54 +02:00
Benjamin Neff
06b61b6480
Merge branch 'next-minor' into develop
2017-03-25 20:38:00 +01:00
Steffen van Bergerem
57b7debdb6
Refactor location stream view, remove unused function
...
closes #7364
2017-03-25 20:37:37 +01:00
Steffen van Bergerem
05e9798027
Fix sharing indicator on profile page for blocked users
...
closes #7382
2017-03-25 20:35:45 +01:00
Steffen van Bergerem
d3de97b244
Disable autocomplete for the conversation form recipient input
...
closes #7375
2017-03-25 20:34:13 +01:00
Steffen van Bergerem
a639951b20
Remove unused jquery.infinitescroll
...
closes #7370
2017-03-25 20:32:33 +01:00
Steffen van Bergerem
f5c937b9cf
Fix comment mentions spacing
2017-03-24 13:11:16 +01:00
Steffen van Bergerem
a1199ac219
Remove mentions-input-box
2017-03-24 01:14:01 +01:00
Steffen van Bergerem
d38eabf333
Refactor mentions-input-box css
2017-03-24 01:07:39 +01:00
cmrd Senya
c2f352d837
Comment mentions front-end
2017-03-24 00:40:24 +02:00
Steffen van Bergerem
a2ca68b523
Merge branch 'next-minor' into develop
2017-03-21 13:34:59 +01:00
flaburgan
ad7d4d777b
Add links to liked and commented pages within My activity
...
closes #5502
2017-03-21 13:34:47 +01:00
Steffen van Bergerem
80b53adcf0
Merge branch 'next-minor' into develop
2017-03-21 13:08:52 +01:00
flaburgan
b3e3de08b8
Fix block user failing feature
...
closes #7379
2017-03-21 13:08:44 +01:00
cmrd Senya
c90cb3328e
jQuery 3 integration
2017-03-18 16:50:52 +02:00
Steffen van Bergerem
ca6ce912d3
Merge branch 'next-minor' into develop
2017-03-17 11:34:56 +01:00
cmrd Senya
526ebcfa13
In jQuery 3 "#" is disallowed as a selector
...
here is a somewhat hacky way to force use an empty selector where "#"
was used as a selector before
closes #7372
2017-03-17 11:34:45 +01:00
Steffen van Bergerem
7eb3dabb44
i18n for color themes
2017-03-16 12:25:41 +01:00
Steffen van Bergerem
1b9ab16039
Merge branch 'next-minor' into develop
2017-03-06 21:11:54 +01:00
cmrd Senya
2739259fb6
some more replacements for deprecated jquery methods
...
closes #7356
2017-03-06 21:11:47 +01:00
Steffen van Bergerem
0aefc76aaa
Merge branch 'next-minor' into develop
2017-03-06 21:10:31 +01:00
Senya
0e28cfadb2
remove unused setPreload function
...
closes #7354
2017-03-06 21:10:25 +01:00
Steffen van Bergerem
6fce2810e5
Merge pull request #7331 from SuperTux88/fix-mentioned-in-comments-notifications
...
Fix mentioned in comments notifications
2017-03-05 20:07:25 +01:00
Benjamin Neff
509f429cc8
Move 'distinct' to 'allowed_to_be_mentioned_in_a_comment_to'
2017-03-05 17:59:28 +01:00
Benjamin Neff
e82ac2199f
Merge branch 'next-minor' into develop
2017-03-04 22:11:22 +01:00
Steffen van Bergerem
ff64581a70
Bump fineuploader
2017-03-04 22:09:25 +01:00
Benjamin Neff
e1bf447aad
Merge branch 'next-minor' into develop
2017-03-04 21:08:18 +01:00
Steffen van Bergerem
12deda1429
Change regexp for hashtags
...
Fixes #5765 , fixes #5815 , supersedes #6099 .
closes #7350
2017-03-04 21:08:11 +01:00
Benjamin Neff
0488902b66
Merge branch 'next-minor' into develop
2017-02-19 21:56:19 +01:00
Steffen van Bergerem
bb2826842f
Only display invite link on contacts page if invitations are enabled
...
fixes #7340
closes #7342
2017-02-19 21:55:10 +01:00
Benjamin Neff
fa85b17890
Merge branch 'next-minor' into develop
2017-02-19 03:20:39 +01:00
Steffen van Bergerem
0627cdaf43
Use autosize in modals
...
Fixes #7338 and missing autosize in conversation forms on the profile page
and the contacts page. Regression from #6674 .
closes #7339
2017-02-19 03:20:26 +01:00
Benjamin Neff
ec2c4a8564
Merge branch 'next-minor' into develop
2017-02-18 23:00:59 +01:00
Steffen van Bergerem
436934e890
Refactor reshares controller using reshare service
2017-02-18 22:59:38 +01:00
Steffen van Bergerem
44b616eda8
Add reshare service
2017-02-18 22:59:38 +01:00
Steffen van Bergerem
e74b524e8f
Refactor likes index route
2017-02-18 22:59:37 +01:00
Steffen van Bergerem
2772cb6e0c
Refactor likes controller using like service
2017-02-18 22:59:37 +01:00
Steffen van Bergerem
f93124863f
Add like service
2017-02-18 22:59:33 +01:00
Benjamin Neff
f9cf844602
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
...
Remove chartbeat and mixpanel support
2017-02-17 22:22:30 +01:00
Benjamin Neff
3d95642aca
Fix receiving multiple mentioned-in-comment notifications
...
When somebody commented multiple times and is mentioned in another
comment afterwards, the person received multiple notifications.
2017-02-16 03:09:40 +01:00
Benjamin Neff
eac8c7572c
Remove unused From headers
...
It is already added in the default_headers
2017-02-16 03:09:39 +01:00
Benjamin Neff
97c351c7b4
Add In-Reply-To and References header to mentioned in comment mail
2017-02-16 02:47:35 +01:00
Benjamin Neff
f1f1d09944
Merge pull request #7302 from svbergerem/simplify-mentions-publisher
...
Simplify mentions in the publisher
2017-02-15 03:15:01 +01:00
Steffen van Bergerem
810e43787c
Merge branch 'next-minor' into develop
2017-02-14 10:37:05 +01:00
Benjamin Neff
d68ad916c8
Remove whitespace from author link
...
closes #7330
2017-02-14 10:36:58 +01:00
Steffen van Bergerem
c8ee03f639
Merge branch 'next-minor' into develop
2017-02-14 09:59:34 +01:00
Benjamin Neff
8182e711b1
closes #7329
2017-02-14 09:59:30 +01:00
Benjamin Neff
8a409c815c
Merge branch 'next-minor' into develop
2017-02-14 00:30:53 +01:00
Steffen van Bergerem
5f8c838750
Change color of author-name on hover
...
closes #7326
2017-02-14 00:30:44 +01:00
Steffen van Bergerem
ef3faff8f1
Render mentions as links in comments
2017-02-13 21:47:57 +01:00
Steffen van Bergerem
99351bd152
Merge branch 'next-minor' into develop
2017-02-13 14:21:29 +01:00
Benjamin Neff
e92431ba88
Remove some unused color-theme overrides
...
After #7318 $link-color is used by default, no need to override anymore.
closes #7325
2017-02-13 14:21:20 +01:00
Benjamin Neff
2f9a032b38
Merge branch 'next-minor' into develop
2017-02-12 21:01:36 +01:00
Steffen van Bergerem
9558e747e4
Increase time to wait before showing the hovercard
...
closes #7319
2017-02-12 21:01:21 +01:00
Steffen van Bergerem
a6e6e6de91
Refactor publisher mentions backbone view
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
b23debf0b6
Refactor publisher backbone view
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
9217df43cd
Only update mentions in publisher before opening suggestions or preview
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
90b379b110
Drop useless data attribute for message text in publisher
2017-02-12 18:36:26 +01:00
Steffen van Bergerem
c4b6b9534c
No more fake text in the publisher
2017-02-12 18:36:26 +01:00
Steffen van Bergerem
a04f32adce
Drop mentions box in the publisher
2017-02-12 18:31:37 +01:00
Steffen van Bergerem
b3c412d38f
Display mention syntax in publisher instead of username
2017-02-12 18:31:36 +01:00
Steffen van Bergerem
408645cccc
Use new mention syntax in the publisher
2017-02-12 18:31:36 +01:00
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
cmrd Senya
ad596d8df1
Fix tags URLs in hovercards
...
fixes #7074
closes #7075
2016-09-09 00:53:21 +02:00
Steffen van Bergerem
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link
...
closes #7061
2016-09-06 05:08:04 +02:00
Benjamin Neff
50e7314535
Cleanup invalid unconfirmed emails
...
Also remove confirm_email_token when unconfirmed_email is removed.
Fixes #7048
closes #7051
2016-09-04 21:40:27 +02:00
Steffen van Bergerem
4d51c02432
Add OpenGraph video support
...
closes #7043
2016-09-04 03:55:09 +02:00
Benjamin Neff
8c58206e63
Fix links of more-button on mobile streams
...
Fixes #6999
closes #7036
2016-09-04 03:31:41 +02:00
Benjamin Neff
4fea926057
Only update interacted_at on new comments
...
I got feedback from many users, that they don't understand how the "my
activity" stream is sorted, because they have posts on the top, but
don't see why. The user doesn't see if a like was added, and it is also
not imported for the user to see the post again then. And we have
notifications if someone likes a users own posts, so no need to move it on
top of the "my activity" stream here too.
closes #7030
2016-09-04 03:29:59 +02:00
Steffen van Bergerem
02ad431fb0
Fix conversations message overflow when posting code
...
Related issue: https://github.com/twbs/bootstrap/issues/15958
closes #7055
2016-09-04 03:28:12 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails
...
closes #7050
2016-09-04 03:26:42 +02:00
Steffen van Bergerem
6ad9000f8c
Sign out users with wrong CSRF tokens
...
See http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf
2016-09-04 03:26:18 +02:00
Steffen van Bergerem
806de7e9d8
Exclude closed accounts from search
...
closes #7042
2016-09-04 03:22:58 +02:00
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions
...
closes #7040
2016-09-04 03:17:48 +02:00
Steffen van Bergerem
02742a4a8f
Use post controls view for single post moderation
2016-09-04 03:16:24 +02:00
Steffen van Bergerem
8faedd574d
Move post controls to a separate view
2016-09-04 03:16:24 +02:00
Steffen van Bergerem
68045cec8c
Remove unused feedback actions view
2016-09-04 03:16:24 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments
...
closes #7045
2016-09-04 03:15:35 +02:00
Steffen van Bergerem
e3e9510e6a
Refactor appending comments to the comment stream
2016-09-04 03:14:17 +02:00
Steffen van Bergerem
ce7d008e09
Set grammatical gender in tags controller
2016-09-04 03:02:27 +02:00
Steffen van Bergerem
08794bc47b
Remove user_photo method from users controller
...
closes #7049
2016-09-04 03:01:51 +02:00
Benjamin Neff
5017bd9541
rewrite notifier template with haml
...
closes #7054
2016-09-04 01:44:15 +02:00
Benjamin Neff
b0611ce270
remove logo from mails
2016-09-04 01:43:24 +02:00
Benjamin Neff
364502a134
bring back sender avatar
2016-09-04 01:43:24 +02:00
Benjamin Neff
575748169e
remove text color from notification mails
2016-09-04 01:43:24 +02:00
lislis
bc64bca9df
update the bug link in the sidebar to the report bug wiki page
2016-09-01 21:34:44 +02:00
Steffen van Bergerem
5b5e3e2c29
Display images inline in profile bio
2016-08-23 01:52:27 +02:00
Steffen van Bergerem
7f0ffb8b0a
Fix invitation link on people search page
2016-08-23 01:52:25 +02:00
Dennis Schubert
ae2cecefae
Merge pull request #7018 from SuperTux88/fix-reshare-metadata
...
Fix regressions from #6998
2016-08-22 02:29:44 +02:00
Benjamin Neff
4b020b8d61
Fix regressions from #6998
...
* fixed old reshares of reshares
* fixed deleted root of a reshare
2016-08-22 00:43:43 +02:00
Benjamin Neff
b3013c8152
bump diaspora_federation
2016-08-22 00:21:25 +02:00
Dennis Schubert
3be0d52bc9
Merge pull request #7016 from svbergerem/fix-7015
...
Fix misplaced publisher prefill on tags page
2016-08-21 14:27:16 +02:00
Dennis Schubert
93037098ce
Merge pull request #7014 from svbergerem/remove-stream-title
...
Remove stream title from main stream
2016-08-21 14:27:04 +02:00
Dennis Schubert
c4485a72af
Merge pull request #7013 from svbergerem/fix-header-badges-small-screens
...
Move notifications and conversations links in collapsed header on small devices
2016-08-21 14:26:54 +02:00
Steffen van Bergerem
3179b492f7
Fix misplaced publisher prefill on tags page
2016-08-21 14:22:41 +02:00
Steffen van Bergerem
fa06eba840
Remove stream title from main stream
2016-08-21 13:26:58 +02:00
Steffen van Bergerem
4b801a0ba9
Move notifications and conversations links in collapsed header on small devices
2016-08-21 12:56:16 +02:00
Steffen van Bergerem
002a7ff984
Fix stream shortcuts on small screens
2016-08-21 10:31:24 +02:00
Benjamin Neff
c6427c4ec0
don't add the root author to the subscribers if the root post was deleted
2016-08-18 23:34:58 +02:00
Denis Hovart
bcace2def2
6840 : meta tags update ( #6998 )
...
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.
* Adds tests to post controller to check correctness of metas
* Add methods to PersonPresenter to have metas on profile pages
* Correct meta data helper test
* Update PersonPresenter, add test to PeopleController
* Creates TagPresenter. Display tag metas on tag index page
* Updata meta data helper spec
* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.
* Set meta info as hashes in presenters
* Move original hardcoded metas info to config/defaults.yml
* metas_tags include by default the general metas, update views
* Update code style, clean views
* Renames TagPresenter StreamTagPresenter, updates TagController spec
* Add a default_metas entry to diaspora.yml.example
* Align metas hash in presenters, refactor meta data helper
* Use bio as description meta if user has a public profile
* Rename StreamTagPresenter to TagStreamPresenter
2016-08-18 21:52:39 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions
...
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:36:27 +02:00
Steffen van Bergerem
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:02:14 +02:00
Jonne Haß
e3a95d7d71
Merge pull request #6995 from SuperTux88/fix-mention-fetching
...
only create mentions after creating statusmessages
2016-08-18 12:00:11 +02:00
Jonne Haß
c74a7041f1
Merge pull request #7000 from svbergerem/router-trailing-slash
...
Fix backbone router for URLs with trailing slashes
2016-08-18 11:59:20 +02:00
Steffen van Bergerem
0a1a7b167f
Merge pull request #6983 from AugierLe42e/fix-mobile-photo-page-avatar
...
Fixes the avatar on mobile multiphoto page
2016-08-18 11:22:29 +02:00
Steffen van Bergerem
18683f9ca8
Fix backbone router for URLs with trailing slashes
2016-08-18 10:57:59 +02:00
Augier
8a3f0778f5
Fixes the avatar display on mobile the photo page
2016-08-18 10:52:31 +02:00
Steffen van Bergerem
34e3fb2e14
Merge pull request #6991 from cmrd-senya/dropdown-regression
...
Fix aspect dropdown when person is being fetched
2016-08-18 10:07:35 +02:00
Steffen van Bergerem
21887675a6
Use Bootstrap pagination on people search page
2016-08-18 01:54:43 +02:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination
2016-08-18 01:54:43 +02:00
Benjamin Neff
fb318373c7
only create mentions after creating statusmessages
2016-08-17 02:26:58 +02:00
cmrd Senya
6fba0e498e
Use diaspora_id validation from the federation gem
...
DRY
2016-08-16 12:08:06 +03:00
Steffen van Bergerem
e5c5490932
Merge pull request #6981 from AugierLe42e/fix-6979
...
Fixes #6979
2016-08-15 23:00:16 +02:00
cmrd Senya
4b3f36e92a
Fix aspect dropdown when person is being fetched
...
fix #6989
2016-08-15 23:43:24 +03:00
Benjamin Neff
23541546e9
Allow hovercards of remote people when not logged in
...
In #6603 hovercards were activated for logged out users, but they only
worked for local people. Hovercards on remote-people are important to
get the diaspora-id to search the person on the local pod, if you don't
know who it is.
2016-08-15 01:33:26 +02:00
Jonne Haß
200486b6f1
Merge pull request #6984 from SuperTux88/6294-ignore-notifications
...
Don't create notifications from ignored people
2016-08-14 18:28:13 +02:00
Benjamin Neff
0d338b6f79
don't create notifications if the notification-actor is ignored
...
Also move "shareable hidden"-logic to AlsoCommented, because it is the
only one that needs it. And write some specs for mentioned and started
sharing notifications.
Fixes #6294
2016-08-14 17:03:49 +02:00
Augier
c5618591c3
Fixes #6979
2016-08-14 11:04:11 +02:00
Steffen van Bergerem
9f8482174b
Display markdown images inline
2016-08-14 08:18:48 +02:00
Benjamin Neff
f4459488e5
allow other people to share with a user who ignores them
...
otherwise we have data-inconsistency if the user stops ignoring the
person.
2016-08-14 01:08:26 +02:00
cmrd Senya
9546fddb9e
[API] don't store ID tokens in DB
...
fix #6857
2016-08-13 20:09:43 +03:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations
...
Cleanup invitations
2016-08-13 14:16:41 +02:00
Benjamin Neff
bc6c8a0598
disable registration with invite-code when invitations are closed
...
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
2016-08-13 13:51:28 +02:00
Benjamin Neff
3b1a5c6bdf
don't reduce number of invites when registration is open
...
otherwise the counter goes into negative ;)
also reset all negative counters
2016-08-13 13:51:02 +02:00
Steffen van Bergerem
da5aef2b75
Fix charcounter position in publisher
2016-08-13 03:21:40 +02:00
Benjamin Neff
e749bbef15
don't reduce number of available invites if there were errors.
2016-08-13 01:47:27 +02:00
Benjamin Neff
2a553940d4
small design fixes for invites
2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a
Cleanup legacy invitations from code
...
Fixes #5116
2016-08-13 01:47:27 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2
...
Comments expansion refactoring
2016-08-12 23:46:22 +02:00
augier
5c2e241106
Displaying the markdown editor on publisher
2016-08-12 23:08:41 +02:00
cmrd Senya
8e6df0b1e3
Comments expansion refactoring
...
If you look at comment expand process with javascript debugger, you
will notice that at first comments get added to existing stream ("add"
event handler of model.comments gets launched because of model.comments.fetch).
Then the comment stream gets empty and then filled by the postRenderTemplate
handler.
This patch removes comments rerendering on the expansion. The fetching process is
changed so that older comments are added to the correct place, so the order
looks nice without rerendering. Thus, unnecessary job of rerendering is avoided.
2016-08-12 22:06:51 +03:00
Jonne Haß
8deef544dc
Merge pull request #6974 from svbergerem/empty-stream
...
Add 'no posts yet' message to empty streams
2016-08-12 14:11:27 +02:00
Steffen van Bergerem
48b0e3d7d1
Add role='alert' to alerts
2016-08-12 12:58:57 +02:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams
2016-08-12 12:55:06 +02:00
Steffen van Bergerem
8a9ce0d6d8
Disable transitions in poltergeist
2016-08-11 19:05:19 +02:00
Jonne Haß
e70ffebc49
Merge pull request #6805 from cmrd-senya/mention-name-fixup
...
Fix up the meaning of the name parameter in mention
2016-08-11 13:28:02 +02:00
cmrd Senya
d200e92aeb
Fix up the meaning of the name parameter in mentions
...
The desktop frontend now treats the "name" parameter of mention as
a string to display unconditionally. But the Diaspora::Mentionable
renders mentions the different way: "name" is treated as a fallback
string which is rendered only if the person's name is unavailable.
This reflects on the mobile version ATM. This patch makes it behave
the same way as the current desktop version does.
2016-08-11 13:19:48 +03:00
Jonne Haß
500b3197b4
Merge pull request #6964 from svbergerem/remove-inline-notifications-javascript
...
Remove inline notifications javascript
2016-08-11 10:25:19 +02:00
Jonne Haß
1d2132ebba
Merge pull request #6965 from SuperTux88/5847-fix-settings-page
...
Fix settings page after submit
2016-08-11 02:29:34 +02:00
Steffen van Bergerem
9b4ff768ca
Sort router.js
2016-08-11 02:23:15 +02:00
Steffen van Bergerem
9c46e69b7a
Fix codestyle in router.js
2016-08-11 02:20:35 +02:00
Steffen van Bergerem
fca4a79f80
Remove inline javascript on notifications page
2016-08-11 02:18:28 +02:00
Benjamin Neff
71ed7446c1
Fix user settings style after submit
...
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings
Fixes #5847
2016-08-11 01:58:47 +02:00
Benjamin Neff
be47c6bcd0
remove redirect hack for devise
...
only expose routes from devise that we actually use
2016-08-11 01:58:47 +02:00
Jonne Haß
bd74eea140
Merge pull request #6962 from svbergerem/fix-mentioning-modal
...
Fix mentioning model being broken when reopening it
2016-08-11 01:05:39 +02:00
Steffen van Bergerem
11f6ed2b9a
Fix community spotlight styles
2016-08-10 23:13:18 +02:00
Steffen van Bergerem
e152dc6549
Get rid of inline javascript on contacts page
2016-08-10 23:13:18 +02:00
Steffen van Bergerem
d60862c3c6
Fix mentioning model being broken when reopening it
2016-08-10 23:09:49 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box
2016-08-10 17:19:58 +02:00
Benjamin Neff
86e75a02bb
fix privacy settings form submit
2016-08-10 13:16:59 +02:00
Benjamin Neff
37837b3f73
fix style on registration-page after errors
2016-08-10 13:16:59 +02:00
Jonne Haß
edd568007d
Merge pull request #6954 from svbergerem/refactor-osm-in-spv
...
Refactor locations in the SPV
2016-08-10 12:10:17 +02:00
Jonne Haß
90abad0152
Merge pull request #6950 from cmrd-senya/consolidate-queues
...
Consolidate queues
2016-08-10 11:46:09 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation
2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV
2016-08-10 11:30:48 +02:00
Jason Robinson
78299c9e2f
Consolidate amount of sidekiq queues from 13 to 5
...
Sidekiq documentation says 'Sidekiq is not designed to work well with dozens of queues.'. Having the amount of queues we have at the moment brings no anyway.
Closes #5571
2016-08-10 08:51:22 +00:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js
2016-08-10 00:41:07 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
9f28b935b9
Drop contacts.json
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts
2016-08-09 15:12:44 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
...
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
Steffen van Bergerem
9cbc7b6050
Refactor photo css
2016-08-09 10:20:34 +02:00
Steffen van Bergerem
09aff30648
Fix hovercards on profile edit page
2016-08-09 01:14:24 +02:00
Steffen van Bergerem
020f8c51b4
Fix other user's profile photos stream
2016-08-09 00:33:12 +02:00
Steffen van Bergerem
dc236b8b9d
Merge pull request #6838 from Flaburgan/masonry-photo
...
Set fixed height of tile in photos stream, fix #6809
2016-08-08 23:46:23 +02:00
Flaburgan
eac051ffaa
Set fixed height of tile in photos stream, fix #6809
2016-08-08 23:28:19 +02:00
Jonne Haß
ca2dd532af
Merge pull request #6940 from SuperTux88/cleanup-posts-table
...
Cleanup posts table
2016-08-08 20:53:24 +02:00
Jonne Haß
e738f40d8f
Merge pull request #6947 from svbergerem/fix-inviter-avatar
...
Various frontend fixes for the getting started page
2016-08-08 20:10:52 +02:00
Benjamin Neff
d3edbfd829
remove pending flag from posts
2016-08-08 19:37:10 +02:00
Benjamin Neff
83db0a8f3e
remove activity_streams, because it was always false ...
2016-08-08 19:37:10 +02:00
Benjamin Neff
ecd13fc713
cleanup old attributes from code
2016-08-08 19:37:09 +02:00
