Commit graph

6929 commits

Author SHA1 Message Date
lambadalambda
b1f9f6395c Merge branch 'feature/attachment-form-improvements' into 'develop'
Fix bugs related to uploading attachments

See merge request !5
2016-11-26 06:43:02 -05:00
Roger Braun
b812adf0ba Move submitDisable into data.
It's not a prop, these are only for passing data, not for local data.
2016-11-26 12:38:33 +01:00
dtluna
cb940a8742 Merge branch 'develop' into 'feature/attachment-form-improvements'
# Conflicts:
#   src/components/attachment/attachment.js
2016-11-25 21:02:53 -05:00
dtluna
01edb7dbe4 Add remove attachment button 2016-11-26 05:00:06 +03:00
dtluna
6f0c73c30a Added previews for videos and audios 2016-11-26 03:19:25 +03:00
dtluna
4f8d476a2b Add fileTypeService 2016-11-25 20:21:25 +03:00
Roger Braun
1be1d7563c Greentext. 2016-11-25 17:34:59 +01:00
Roger Braun
b515586485 Show link to status source url. 2016-11-25 17:34:41 +01:00
Roger Braun
5986afbb20 Re-indent style. 2016-11-25 17:20:06 +01:00
Roger Braun
1d8c813135 Better handling of favorites. 2016-11-25 16:56:08 +01:00
Roger Braun
08393b8580 Fix word wrapping on Firefox.
Also, move some css around.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1136818 for the word
wrapping stuff.
2016-11-25 13:42:33 +01:00
dtluna
96b4997492 Disable the submit button while uploading attachment 2016-11-25 01:07:21 +03:00
Roger Braun
c8d25eab61 Image CSS fix for Firefox. 2016-11-24 20:49:30 +01:00
Roger Braun
b645f1d0ba Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2016-11-24 18:38:36 +01:00
Roger Braun
4f0155c5eb Timeline status adding fixes.
Don't show new statuses immediately if we already have something in there.
2016-11-24 18:31:18 +01:00
Roger Braun
ce0071d6e0 Remember positions on scroll. 2016-11-24 18:24:35 +01:00
Roger Braun
2341a3692a Add link to conversation in status. 2016-11-24 18:19:01 +01:00
Roger Braun
e245074ef7 Add status / conversation component.
And wire it up.
2016-11-24 18:17:09 +01:00
Roger Braun
18c11e405a Add status and conversation fetching to apiService. 2016-11-24 18:16:20 +01:00
Roger Braun
a5f523922c Make timelineless status adding possible. 2016-11-24 18:15:34 +01:00
Roger Braun
81c6f6e21f Remove example component. 2016-11-24 18:14:54 +01:00
lambadalambda
e30485fe47 Merge branch 'feature/audio-upload-improvements' into 'develop'
Add audio player

See merge request !4
2016-11-23 17:03:45 -05:00
dtluna
93be453037 Set cursor to hand when hovering over buttons 2016-11-23 01:58:25 +03:00
dtluna
3210283ae2 Add audio player 2016-11-22 21:45:18 +03:00
lambadalambda
ea697a1bb1 Add license 2016-11-22 12:15:05 -05:00
Roger Braun
b1364d6697 Re-add Contributors file. 2016-11-22 15:51:06 +01:00
Roger Braun
fd4cd6d687 Prepare apiService for base url. 2016-11-22 15:45:40 +01:00
Roger Braun
2147807fa0 Add image height css back in.
Without it, Chrome stretches the image...
2016-11-22 15:44:45 +01:00
Roger Braun
38749e6c4a Remove commented out old api service. 2016-11-22 15:15:43 +01:00
Roger Braun
9380abc8cd ci. 2016-11-22 14:04:54 +01:00
Roger Braun
31fc11ef00 ci. 2016-11-22 13:49:53 +01:00
Roger Braun
362b6200c5 Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe 2016-11-22 11:29:52 +01:00
Roger Braun
281c71b191 Move addNewStatuses code around. 2016-11-21 16:33:08 +01:00
Roger Braun
05f9e68dab Fixes for deletion. 2016-11-19 13:08:44 +01:00
Roger Braun
47ddf8c3fb Small status reducer changes. 2016-11-19 12:39:10 +01:00
Roger Braun
de25c46670 addNewStatuses: mutation -> action
This is to add the current user.
2016-11-18 22:56:20 +01:00
Roger Braun
e7637e4196 Add first notification.
This adds a favorite notification.
2016-11-18 22:55:04 +01:00
Roger Braun
4cef86f2a8 Add status deletion.
Kind of wonky. Would be better if we used the AS endpoints.
2016-11-18 22:25:42 +01:00
Roger Braun
11dd084835 Merge branch 'status_reducer_rewrite' 2016-11-18 20:13:12 +01:00
Roger Braun
9171b382fe Complete rewrite of status adding code.
This now uses nearly only mutation, to take advantage
of vue's mutation tracking.
2016-11-18 19:48:02 +01:00
Roger Braun
05afbbaf66 Better diffs for specs. 2016-11-18 19:47:47 +01:00
Roger Braun
8723c35d43 A bit more advanced status merging. 2016-11-18 16:05:04 +01:00
Roger Braun
7e17600ee9 Small css fix, don't parse html for now. 2016-11-18 00:43:36 +01:00
Roger Braun
4fcb60487c Do more mutation-y status reducing. 2016-11-17 18:31:26 +01:00
Roger Braun
d10a58f26a Some reducer changes for statuses. 2016-11-15 10:35:16 +01:00
Roger Braun
d4284686fa Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/retweet 2016-11-14 21:11:27 +01:00
lambadalambda
a9d65a488f Merge branch 'feature/image-upload-improvements' into 'master'
Feature/image upload improvements

See merge request !2
2016-11-14 15:11:05 -05:00
lambadalambda
ce509937f6 Merge branch 'feature/retweet' into 'master'
Feature/retweet

See merge request !1
2016-11-14 15:09:20 -05:00
Roger Braun
aeb8868b82 prepareStatus: created_at_parsed. 2016-11-13 22:54:49 +01:00
Roger Braun
59647798b9 prepareStatus: nsfw tag parsing. 2016-11-13 22:40:33 +01:00