Commit graph

992 commits

Author SHA1 Message Date
Benjamin Neff
0e526f9221
Bump jasmine
Disable random tests for now, many tests fail when this is true (which
is now default)
2018-04-12 02:41:56 +02:00
Benjamin Neff
66175f6908
Merge branch 'next-minor' into develop 2018-04-12 01:56:07 +02:00
Benjamin Neff
4fa92c1823
Remove flag for contacts visible to each other
This feature only worked on the same pod and was more confusing than
useful.
2018-04-12 01:39:11 +02:00
Benjamin Neff
89f7f97294
Merge branch 'next-minor' into develop 2018-04-10 01:58:07 +02:00
Benjamin Neff
9b83df9646
Merge branch 'master' into next-minor 2018-04-10 01:57:56 +02:00
Benjamin Neff
f4ea138a64
Don't return a SafeString after truncate 2018-04-10 01:54:29 +02:00
Dennis Schubert
ae17248b2e
Merge pull request #7734 from Fensterbank/client-side-picture-resize
Resize images on client-side before uploading
2018-04-02 10:38:51 +02:00
kas70
40fc175d6e
only include mutual sharing contacts in conversations form on contacts page
fixes #7377
2018-03-22 23:15:24 +01:00
Frédéric Bolvin
6d55b15604 Resize images on client-side before uploading 2018-03-11 11:20:16 +01:00
Dennis Schubert
3643612b1c
Back to Top: Make sure to re-check the visibility after the scrolling is done
If a user scrolls just below the 1000px threshold and clicks the back-to-top button within 250ms, we'll never hide the button as the scroll event gets throttled away. That's rather inconvenient.

closes #7729
2018-03-07 00:39:36 +01:00
cmrd Senya
b32c844314
Support for embedding HTML5 media links
Use markdown-it-html5-embed plugin so user can embed audio and
video using the markdown link syntax []() in the HTML5 way.
2018-02-17 19:21:10 +01:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
Steffen van Bergerem
473cc2518b
Replace comment_box with comment-box 2017-08-31 02:44:53 +02:00
Steffen van Bergerem
7729635485
Replace publisher_textarea_wrapper with publisher-textarea-wrapper 2017-08-31 02:44:53 +02:00
Steffen van Bergerem
caeaf23d4b
Replace aspect_dropdown with aspect-dropdown 2017-08-31 02:44:53 +02:00
Steffen van Bergerem
d130697ce2
Use Bootstrap 3 progress-bar for polls
closes #7600
2017-08-29 02:17:32 +02:00
Steffen van Bergerem
02d9d350d9
Move person extension for prefills to conversations form view
closes #7599
2017-08-29 02:13:57 +02:00
Steffen van Bergerem
48630b3a04
Fix conversation recipient prefill on contacts page
Use the already available contacts data for the prefill
2017-08-29 02:13:27 +02:00
Steffen van Bergerem
666ada44f1
Fix conversation recipient prefill on profile page
Fixes #7586

Use the already available data about the recipient for the prefill
2017-08-29 02:13:27 +02:00
Rete2
b556ad5211
show users vote in poll
closes #7550
2017-08-26 03:16:05 +02:00
ivan sebastian
3016280ef1
add jquery are you sure to comment form
closes #7530
2017-08-19 12:31:24 +02:00
Steffen van Bergerem
6ae2df2f9e
Fix missing timeagos for comments in the single post view 2017-08-17 11:40:49 +02:00
Steffen van Bergerem
4cb365a6f4
Fix missing photos in the single post view
closes #7545
2017-08-17 03:25:31 +02:00
Benjamin Neff
dd6cbbbb8e
Remove avatar, name, timestamp and interactions from publisher preview
This doesn't add any value in the post preview:
* Avatar is already at the left-hand side of the publisher
* Timestamp is always "less than a minute ago"
* Interactions are disabled in the preview anyway

We don't display these things in the comment preview either, they only
need space and don't add any value to the preview.
2017-08-14 02:21:28 +02:00
Steffen van Bergerem
54d70a87ed
Render mentions in comment previews correctly 2017-08-13 13:50:02 +02:00
flaburgan
21cdc6041d
Private profile 2017-08-13 04:53:53 +02:00
Steffen van Bergerem
ad53a43f88
Remove unused post interactions parse method 2017-08-12 18:09:14 +02:00
Steffen van Bergerem
6b162110ce
Add 'show all' links to the SPV to fetch missing likes and reshares 2017-08-12 18:09:13 +02:00
Steffen van Bergerem
0bfc2fdd77
Load likes and reshares in the SPV via gon 2017-08-12 18:09:13 +02:00
ivan sebastian
b154e9d7f9 support cmd+enter for post submission 2017-08-11 23:33:37 +07: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
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
flaburgan
0798bfbc8c Refactor ids to classes, reorder css properties, css selectors depth 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
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
Steffen van Bergerem
bc0088eb47
Increase mobile reshare counter after reshare 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
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
Steffen van Bergerem
adf35b4bf0
Bump jasmine 2017-07-25 16:25:44 +02:00
Benjamin Neff
064fc3cc45
Merge branch 'next-minor' into develop 2017-05-05 02:30:56 +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
Benjamin Neff
e91a0a57a3
Merge branch 'next-minor' into develop 2017-04-08 00:00:56 +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
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop 2017-03-27 00:04:53 +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
06b61b6480
Merge branch 'next-minor' into develop 2017-03-25 20:38:00 +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
cmrd Senya
c2f352d837
Comment mentions front-end 2017-03-24 00:40:24 +02:00
cmrd Senya
71e0bdc411
app_spec fixes 2017-03-18 16:50:55 +02: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
cmrd Senya
f36a4cd1f5
don't use the deprecated ".selector" method 2017-03-06 21:11:13 +01:00
cmrd Senya
a479db1c96
a missing spy 2017-03-06 21:11:12 +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
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
Senya
302ee795b6
Fix a jasmine test issue
The issue from a jasmine spec introduced by #7227 caused the testsuite that runs in a browser to be redirected out of the jasmine runner and therefore not finished.

closes #7299
2017-01-28 18:04:01 +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
a341be7677 Bump markdown-it-diaspora-mention 2017-01-14 02:08:14 +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
Steffen van Bergerem
c9d49c89a6 Always show mobile reaction counts
fixes #5829
2017-01-11 02:43:06 +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
fb06d03f49 Close modals at the end of each jasmine spec
closes #7246
2017-01-10 23:32:27 +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
00ce187b07 Don't show browser notifications on pageload
closes #7211
2016-12-01 02:27:52 +01:00
Steffen van Bergerem
f999624967 Use error message from the server when comment failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
82e78d3ce8 Use error message from the server when like failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
6c5c865b15 Use error message from the server when reshare failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8078c60cee Refactor aspect membership error response handling with flash messages 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
b645541d52 Update notifications when changing the stream
fixes #6473

closes #7199
2016-11-22 03:00:59 +01:00
Steffen van Bergerem
5660d2f4a8 Refactor comment creation in post interactions backbone model
closes #7186
2016-11-19 03:40:42 +01:00
Steffen van Bergerem
ed5f218559 Only clear comment textarea when comment submission was successful
fixes #5094
2016-11-19 03:40:29 +01:00
Augier
af331bfb30
Add collection to app.views.NotificationDropdown and app.views.Notifications
closes #6952
2016-11-18 15:27:37 +01:00
Steffen van Bergerem
37b34237b9 Force jasmine fails on syntax errors
closes #7185
2016-11-15 22:50:17 +01:00
Steffen van Bergerem
cdce25374f Reduce i18n.load side effects
closes #7184
2016-11-15 22:46:06 +01:00
Steffen van Bergerem
a951c40ba0 Only reload profile header when changing aspect memberships
closes #7183

fixes #7072
2016-11-15 22:37:39 +01:00
Steffen van Bergerem
3930069e67 Leave help view spec with the default locale 2016-11-15 22:36:06 +01:00
Steffen van Bergerem
8983554f94 Improve profile header jasmine test
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
cbe3ca5cf6 Improve conversations form jasmine test
* test that tag element are removed when clicking the tag's remove button
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
4c86b64532 Improve contacts page jasmine test
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
2016-11-13 20:08:59 +01:00
Augier
f2fdaf1daf Use typeahead on conversations 2016-11-13 20:08:59 +01:00
Steffen van Bergerem
5269a0d3c0
Fix aspect membership view spec syntax
Regression introduced in #7132
2016-11-12 21:37:48 +01:00
Steffen van Bergerem
a73e1baaed Show spinner when loading comments
closes #7170
2016-11-03 22:50:03 +01:00
Steffen van Bergerem
e3b3da404f Fetch comments, likes and reshares separately
Fixes #7165

closes #7167
2016-11-02 23:02:32 +01:00