Commit graph

9342 commits

Author SHA1 Message Date
Benjamin Neff
eb19c327e2
Add ApplicationRecord 2017-08-12 15:39:20 +02:00
Benjamin Neff
fe57bd88e8
Add ApplicationMailer 2017-08-12 15:39:20 +02:00
Benjamin Neff
4a9548ec1b
Use skip_pipeline: true for asset_url 2017-08-12 15:39:20 +02:00
Steffen van Bergerem
7624854495
Merge pull request #7235 from AugierLe42e/md-editor-mobile-view
Markdown editor final chapter: add editor on publisher, comments and conversation of mobile view
2017-08-12 11:56:57 +02:00
Steffen van Bergerem
a6fb85d10f
Merge pull request #7524 from ivantedja/7273-cmd-enter-submit
support cmd+enter for post submission
2017-08-12 11:55:23 +02:00
Steffen van Bergerem
f4cdec03c7
Remove obsolete conversation and new status message CSS 2017-08-12 11:02:47 +02:00
Steffen van Bergerem
d4ed3bce4d
Remove unnecessary markdown editor CSS 2017-08-12 11:02:46 +02:00
ivan sebastian
b154e9d7f9 support cmd+enter for post submission 2017-08-11 23:33:37 +07:00
flaburgan
2b90bb8562 Hide 'Sign in' header link on the connection page 2017-08-11 17:40:29 +02:00
Augier
008b899422
Markdown editor on publisher, conversations and mobile comments 2017-08-11 10:51:14 +02:00
Benjamin Neff
280a9e2023
Merge pull request #7523 from svbergerem/improve-adding-posts-to-stream
Improve adding posts to stream
2017-08-11 03:21:48 +02:00
Steffen van Bergerem
ba9a2cbeba
Remove no posts info after rendering with available posts 2017-08-11 02:24:52 +02:00
Steffen van Bergerem
4c7948c7f7
Use id in stream comparator as fallback 2017-08-11 02:24:51 +02:00
Benjamin Neff
43bdebca74
Merge pull request #7522 from svbergerem/fix-autosize-comments-conversations
Call autosize when changing input via markdown editor
2017-08-10 22:31:12 +02:00
Steffen van Bergerem
39110c6b1b Use full width for notification dropdown on small devices 2017-08-10 17:51:01 +02:00
Steffen van Bergerem
8ce76882e3 Replace deprecated visible-* classes 2017-08-10 17:51:01 +02:00
Steffen van Bergerem
635a5c0564 Remove unused check for visible notification badge in notification dropdown view 2017-08-10 17:51:01 +02:00
Steffen van Bergerem
6995ca1fe3 Fix vertical alignment of search bar in the header 2017-08-10 17:51:01 +02:00
Steffen van Bergerem
9c40009ee1 Avoid using fixed vertical margins and paddings in the header 2017-08-10 17:51:01 +02:00
flaburgan
91e0e131a5 Improve colors management 2017-08-10 17:51:01 +02:00
flaburgan
047bb607f3 Do not hardcode image path 2017-08-10 17:51:01 +02:00
flaburgan
0798bfbc8c Refactor ids to classes, reorder css properties, css selectors depth 2017-08-10 17:51:01 +02:00
flaburgan
b995dfd179 Avoid search result dropdown to be hidden 2017-08-10 17:51:01 +02:00
flaburgan
99570c9c07 Responsive header for not connected pages too 2017-08-10 17:51:01 +02:00
flaburgan
569411acb8 Change global menu content on small screen 2017-08-10 17:51:01 +02:00
flaburgan
ae73294f41 Improved responsive header 2017-08-10 17:51:01 +02:00
Steffen van Bergerem
d4bdb2fcb4
Call autosize when changing input via markdown editor
Fixes #7521
2017-08-10 16:42:19 +02:00
Benjamin Neff
9d2d20e854
Merge pull request #6726 from cmrd-senya/archive-schema
Update the user data export archive format.
2017-08-10 10:54:02 +02:00
cmrd Senya
9bcdc90cfd
Fix Person.in_aspects scope multiple return
Fix Person.in_aspects scope to return each person only once when the
person is in multiple aspects.
2017-08-10 09:36:34 +03:00
cmrd Senya
7374661e2f
Update the user data export archive format.
This commit introduces changes to the user data export archive format.
This extends data set which is included in the archive. This data can be
then imported to other pods when this feature is implemented.

Also the commit adds the archive format json schema. ATM it is used in
automatic tests only, but in future it will also be used to validate
incoming archives.
2017-08-10 09:36:26 +03:00
Benjamin Neff
eefa6701a8
Merge pull request #7520 from svbergerem/increase-mobile-post-action-size
Include count in mobile post action link and increase reshare counter after reshare
2017-08-10 01:30:39 +02:00
Benjamin Neff
05a4bf262a
Merge pull request #7518 from svbergerem/fix-7245
Prevent publisher from closing in preview mode
2017-08-10 01:27:55 +02:00
Benjamin Neff
c06af05e19
Merge pull request #7516 from Flaburgan/back-to-top-position
Move back to top to the right to avoid misclicks
2017-08-10 01:26:28 +02:00
Steffen van Bergerem
bc0088eb47
Increase mobile reshare counter after reshare 2017-08-10 01:16:53 +02:00
Steffen van Bergerem
18256f3709
Include count in mobile post action link (reshare, comment and like) 2017-08-10 01:16:53 +02:00
Steffen van Bergerem
dc828e0e5a
Prevent publisher from closing in preview mode
Fixes #7245
2017-08-09 22:12:00 +02:00
cmrd Senya
621d269760
MD editor coversations&comments: refactorings
Javascript refactorings for better maintainability:
* simplePreview function to avoid code duplication
* Preloaded conversation is processed in a slightly different way
* Split isPreviewOrTexareaNotEmpty function since it has more than one responsibility
2017-08-09 21:49:25 +02:00
cmrd Senya
2c3f116326
Add new scopes for the Post model 2017-08-09 21:43:37 +03:00
cmrd Senya
8f4498506d
Fix autosize for the textarea in conversations
We need to reinit autosize when we navigate in conversations with the backbone router.
2017-08-09 20:35:23 +03:00
Augier
7b711254a5
Fix CSS and blur on commant submission 2017-08-09 20:35:23 +03:00
Augier
fd39a48bea
Add markdown editor on conversations and comments 2017-08-09 20:35:23 +03:00
cmrd Senya
c985af1f85
New Exporter::OthersRelayables class
This class implements methods that allow to query relayables (comments, likes, participations,
poll_participations) of other people for posts of the given person.
2017-08-09 18:09:04 +03:00
cmrd Senya
fca6121c6a
Exporter::PostsWithActivity class
This class allows to query posts where a person made any activity (submitted comments,
likes, participations or poll participations).
2017-08-09 18:09:04 +03:00
flaburgan
62fa43b222 Move back to top to the right to avoid misclicks 2017-08-08 13:01:58 +02:00
flaburgan
1eea034844 Add a test 2017-08-07 20:21:51 +02:00
flaburgan
9a27983313 Refactor name condition to a cleaner code, delegate :full_name from profile to person to user 2017-08-07 19:08:17 +02:00
flaburgan
c2e0feb38b Include first/last name in invitation emails 2017-08-07 19:08:17 +02:00
Benjamin Neff
c42315f3ee
Merge pull request #7507 from SuperTux88/sprockets-3
Upgrade sprockets
2017-07-31 21:43:43 +02:00
Steffen van Bergerem
cd0f8a6670
Remove unused data attribute from mobile comments 2017-07-30 12:20:44 +02:00
Steffen van Bergerem
8a3d33d707
Add guid as id attribute to mobile comments 2017-07-30 12:16:47 +02:00
Benjamin Neff
1360dd4207
Fix require favico.js
See rails/sprockets#169
2017-07-30 04:47:16 +02:00
netagonen
ce90d6a020
Replace Diaspora* with pod_name in the FROM header
Add pod name to FROM: header for no sender case
2017-07-25 00:49:02 +02:00
Rete2
2be0644281
Issue #6559: Changed default mail FROM header and tests 2017-07-25 00:46:02 +02:00
Benjamin Neff
f9476409c8
Send public profiles publicly
this will help big profiles, and the informations are public anyway, so no
need to encrypt them.

fixes #3164
2017-07-23 02:36:22 +02:00
Benjamin Neff
7e9935c8b2
Replace jquery-ui-rails with rails-assets-jquery.ui 2017-07-23 00:31:05 +02:00
Benjamin Neff
31e85f32ac
Bump carrierwave 2017-07-22 23:43:07 +02:00
Finn Woelm
070ef782e6 Fix: Failing 'Signs Up'-Feature Tests
Up to now, scripts were loaded prior to the stylesheet in <head>. When
scripts are loaded before stylesheets, it is possible that scripts
execute on the DOM elements before styles are fully loaded. This can
yield unexpected results.

In the case of the features/desktop/signs_up.feature tests, it would
happen every so often that the scripts ran before styles were loaded.
For example, the app.views.Publisher class (responsible for actions
related to creating a new post) relies on the poll element being either
hidden (or poll options being defined). As per stylesheet, the poll is
hidden by default. But when the scripts run before the stylesheet has
loaded, the poll appears visible to the script and post submission is
disabled.

This is fixed by loading stylesheets prior to scripts. See SO for more
info: https://stackoverflow.com/a/1324720/6451879
2017-07-18 18:38:36 +07:00
Benjamin Neff
01ca08b86f
Merge pull request #7436 from SuperTux88/federation-update
Federation gem update
2017-07-14 01:31:32 +02:00
Benjamin Neff
6c1ebea633
Merge pull request #7483 from Flaburgan/7393-always-link-comment-mobile
Always link comment count text on mobile
2017-07-13 02:31:30 +02:00
Benjamin Neff
3817dc9a5b
Merge pull request #7480 from Flaburgan/7402-space-comment-mobile-spv
Fix height too high on mobile SPV, closes #7402
2017-07-13 02:31:07 +02:00
flaburgan
fc27640468 Always link comment count text on mobile 2017-07-12 16:00:26 +02:00
Benjamin Neff
bc663253d2
Merge branch 'next-minor' into develop 2017-07-07 09:02:19 +02:00
Dennis Schubert
e47895f3e1
Center .excellence-box contents
closes #7481
2017-07-07 09:01:34 +02:00
flaburgan
2dc142bd70
Add access to the report page on mobile for moderators
closes #7479
2017-07-07 08:58:42 +02:00
flaburgan
9146c8d80f Fix height too high on mobile SPV, closes #7402 2017-07-05 17:19:20 +02:00
Benjamin Neff
58609e42d7
Merge branch 'next-minor' into develop 2017-07-05 02:10:24 +02:00
flaburgan
ddda28102c
Clean up the footer links a bit
closes #7446
2017-07-05 01:59:18 +02:00
flaburgan
ea9e50085d
Add link to discourse in footer and left side bar 2017-07-05 01:57:17 +02:00
flaburgan
07d0ed916d
Fix design issues + pronto
closes #7295
2017-07-05 01:51:07 +02:00
flaburgan
427aa8794e
Add tests for mobile drawer 2017-07-05 01:50:16 +02:00
flaburgan
2782edc780
Refactor partials + pronto 2017-07-05 01:50:16 +02:00
flaburgan
a7d97b7fd3
Add mobile message confirmation on user invit action, Refactor admin responsive code to use bootstrap grid
Hide pod version alert only in the mobile version, not depending on screen size
2017-07-05 01:50:16 +02:00
flaburgan
7bdf33e1a8
Move invitation form under the user search in admin
Indicates when there is no report to review to avoid a weird empty page
2017-07-05 01:50:16 +02:00
SansPseudoFix
5cb4c6e5df
Refactor, more partials + No version check for mobile 2017-07-05 01:50:16 +02:00
SansPseudoFix
276b640418
Add admin views to mobile, use partials for common code with desktop 2017-07-05 01:50:10 +02:00
Benjamin Neff
d71aa6a54a
Merge branch 'next-minor' into develop 2017-07-03 03:46:54 +02:00
atulonruby
df1139234f
Warn user if he leaves profile editing page #6520
closes #7473

closes #6589
2017-07-03 03:45:57 +02:00
cmrd Senya
c2b9b8ab54
Use ContactRetraction for stop sharing with someone 2017-07-03 03:14:42 +02:00
Benjamin Neff
4f9e560ab3
Use RFC 7033 webfinger from diaspora_federation gem 2017-07-03 03:14:41 +02:00
Benjamin Neff
07e9bf8be8
Remove old unused salmon method 2017-07-03 03:14:40 +02:00
Benjamin Neff
246d1ebbdf
Remove legacy post xml
This was used for the old post fetching

Related to diaspora/diaspora_federation#31
2017-07-03 03:14:40 +02:00
Benjamin Neff
b6b0aac969
Send only Retractions
Related to diaspora/diaspora_federation#27
2017-07-02 23:56:00 +02:00
Benjamin Neff
e907b3eb18
Send Contact entity for start/stop sharing
Related to diaspora/diaspora_federation#32
2017-07-02 23:56:00 +02:00
Benjamin Neff
95def40c55
Make Message entity non-relayable
Related to #36
2017-07-02 23:56:00 +02:00
Benjamin Neff
49822a9af7
New namespace for InvalidRootNode 2017-07-02 23:55:59 +02:00
Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop 2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
fixes #7195

closes #7455
2017-05-26 01:50:55 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop 2017-05-21 12:06:41 +02:00
Benjamin Neff
e177706769
Add admin account username to NodeInfo metadata
Fixes #7421

closes #7447
2017-05-21 12:06:35 +02:00
Benjamin Neff
7934c1e969
Add NodeInfo 2.0 support 2017-05-21 12:05:54 +02:00
Benjamin Neff
e463397122
Merge branch 'next-minor' into develop 2017-05-16 00:37:06 +02:00
cmrd Senya
6abd0509f9
Use guid instead of id at permalink and in SPV
This changes links from /posts/:id to /posts/:guid where the links are
not clicked very often. ID search is faster than guid search so we can't
change it everywhere, but these links are not very useful for clicking,
but can be used for easier guid look up.

closes #7453
2017-05-16 00:36:43 +02:00
Benjamin Neff
ee05cc8270
Merge branch 'next-minor' into develop 2017-05-13 02:09:25 +02:00
Mahonri Gibson
942e090b3a
Fix welcome message crashing server if podmin is set to invalid user.
Fixes #7363

closes #7452
2017-05-13 02:08:51 +02:00
Benjamin Neff
f4f0e724c6
Merge branch 'next-minor' into develop 2017-05-11 04:24:29 +02:00
Benjamin Neff
02b4d3f347
Don't raise when the public key of a person is "broken"
Breaking a public key of a person can be used to "block" receiving posts
from this person on the pod. So we should handle that case better and
not just trigger many retries for something that will fail again.

closes #7448
2017-05-11 04:24:13 +02:00
Benjamin Neff
064fc3cc45
Merge branch 'next-minor' into develop 2017-05-05 02:30:56 +02:00
Steffen van Bergerem
23d3d9dc3f
Use post page title for atom feeds and add entry author
Fixes #7249

closes #7420
2017-05-05 02:30:46 +02:00
Steffen van Bergerem
fc28d6af35
Fix first comment in mobile view with french locale
Fixes #7438. The regression has possibly been introduced by #7207.

closes #7441
2017-05-05 02:26:22 +02:00
Steffen van Bergerem
7f784cf2b1
Merge branch 'next-minor' into develop 2017-05-03 02:09:07 +02:00
Benjamin Neff
9e36f0201c
Initialize timeago only after language is set
closes #7419
2017-05-03 02:08:57 +02:00
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