Roger Braun
|
ffc23dc686
|
Merge branch 'hae/pleroma-fe-develop' into develop
|
2017-02-23 01:53:52 +01:00 |
|
Hector A. Escobedo
|
c338940084
|
Fix syntax errors and hiding logic.
This has been tested.
|
2017-02-22 19:31:49 -05:00 |
|
Hector A. Escobedo
|
a7db72d7a7
|
Add setting to toggle NSFW hiding.
|
2017-02-22 18:39:56 -05:00 |
|
Roger Braun
|
b939f70d17
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
|
2017-02-23 00:26:52 +01:00 |
|
Roger Braun
|
74931dece7
|
Revert "Show actual status in notifications when mentioned."
This reverts commit 0e1ab69c33.
|
2017-02-23 00:26:37 +01:00 |
|
lambadalambda
|
854faf905e
|
Merge branch 'feature/user-card-improvements' into 'develop'
User card visual improvements
See merge request !29
|
2017-02-22 18:09:54 -05:00 |
|
Roger Braun
|
7c0f3ea666
|
Add setting to hide all attachments.
|
2017-02-23 00:04:47 +01:00 |
|
shpuld
|
9237f0b918
|
Removed unnecessary debug stuff
|
2017-02-23 00:39:41 +02:00 |
|
Roger Braun
|
0e1ab69c33
|
Show actual status in notifications when mentioned.
|
2017-02-22 23:37:12 +01:00 |
|
shpuld
|
715bfb3dca
|
Make gradient use the theme colors, adjust user interction elements, make profiles without bg use a darker gray solid color to not drown out white text.
|
2017-02-23 00:24:37 +02:00 |
|
Roger Braun
|
9778d4cfc0
|
More eslint fixes.
|
2017-02-22 22:43:40 +01:00 |
|
Roger Braun
|
5abf857705
|
Style fixes.
|
2017-02-22 22:33:28 +01:00 |
|
lambadalambda
|
b9be4708e6
|
Merge branch 'feature/drag_and_drop_for_media_upload' into 'develop'
Proper handling of drag/drop for most platforms
See merge request !28
|
2017-02-22 16:31:59 -05:00 |
|
shpuld
|
1072cd6c02
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/user-card-improvements
|
2017-02-22 23:08:49 +02:00 |
|
shpuld
|
ede4d77cfd
|
Move profile picture to right side, make the names appear next to it, extend profile background pic further and fade it out with gradients, fix the crappy borders around the inline user card.
|
2017-02-22 23:08:14 +02:00 |
|
Roger Braun
|
ec5d8b9833
|
Set colors into config so they can be used for more dynamic styles.
|
2017-02-22 21:14:55 +01:00 |
|
shpuld
|
ded2d54cca
|
Merged existing changes from 'develop'
|
2017-02-22 15:04:28 +02:00 |
|
shpuld
|
6c385ae80a
|
Make drag&drop work on more browsers/platforms, make the Upload button accept drops as well.
|
2017-02-22 14:53:05 +02:00 |
|
lambadalambda
|
935c0e09c6
|
Merge branch 'fix/dont_display_following_when_logged_out' into 'develop'
Hide Follow-button and 'Follows you' text when not logged in
Closes #14
See merge request !27
|
2017-02-22 05:11:18 -05:00 |
|
shpuld
|
874f976531
|
Hide Follow-button and 'Follows you' text when not logged in
|
2017-02-22 11:54:09 +02:00 |
|
Roger Braun
|
8d4d8b6b6c
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
|
2017-02-22 10:32:59 +01:00 |
|
Roger Braun
|
aa3512205d
|
Only save every minute.
|
2017-02-22 10:32:44 +01:00 |
|
lambadalambda
|
3b2e79f6f7
|
Merge branch 'feature/drag_and_drop_for_media_upload' into 'develop'
Dragging and dropping files into text box attempts to upload them.
See merge request !26
|
2017-02-21 15:51:44 -05:00 |
|
Roger Braun
|
892b826df5
|
Small style adjustment, add meta-enter posting.
|
2017-02-21 21:48:48 +01:00 |
|
Roger Braun
|
34a593aa27
|
Merge branch 'develop' into feature/drag_and_drop_for_media_upload
|
2017-02-21 21:30:16 +01:00 |
|
Roger Braun
|
40fe40d96b
|
Better attachment removal styling.
|
2017-02-21 15:24:35 +01:00 |
|
Roger Braun
|
137a7e643d
|
Remove flex from general attachments.
|
2017-02-21 15:24:05 +01:00 |
|
Roger Braun
|
f385e64a7c
|
Update vue-style-loader.
|
2017-02-21 15:23:46 +01:00 |
|
shpuld
|
ca71722c1e
|
Files dropped into post_status_form text box get sent to media_upload for attachment upload, media_upload reorganized a bit to allow reuse of existing code.
|
2017-02-21 15:13:19 +02:00 |
|
Roger Braun
|
7661357cf6
|
Merge branch 'develop' into feature/hash-routed
|
2017-02-21 11:48:55 +01:00 |
|
Roger Braun
|
abc9f06d93
|
Use runtime only build.
|
2017-02-21 11:48:08 +01:00 |
|
Roger Braun
|
b98cfbfade
|
Merge branch 'develop' into feature/hash-routed
|
2017-02-21 11:24:01 +01:00 |
|
Roger Braun
|
132d502194
|
Use correct vue import.
|
2017-02-21 11:23:03 +01:00 |
|
lambadalambda
|
842e15a314
|
Merge branch 'feature/mark_conversations_with_a_red_line' into 'develop'
Feature/mark conversations with a red line
See merge request !25
|
2017-02-21 04:23:13 -05:00 |
|
shpuld
|
3d69a91aba
|
cleanup/better naming
|
2017-02-21 10:22:04 +02:00 |
|
shpuld
|
c244067787
|
Use a red border for expanded statuses
|
2017-02-21 10:19:42 +02:00 |
|
lambadalambda
|
549ee15472
|
Add changelog
|
2017-02-20 13:11:57 -05:00 |
|
Roger Braun
|
5d8b2eb8b5
|
Merge branch 'develop' into feature/hash-routed
|
2017-02-20 18:58:18 +01:00 |
|
Roger Braun
|
73afa8e075
|
Save notifications again.
|
2017-02-20 18:54:30 +01:00 |
|
Roger Braun
|
6e388c0126
|
Compress saved state with zlib.
|
2017-02-20 18:54:09 +01:00 |
|
Roger Braun
|
de986b81d5
|
Update package.json.
|
2017-02-20 18:42:10 +01:00 |
|
Roger Braun
|
ce6fb91501
|
Throttle saving data, once every 5 seconds is enough.
|
2017-02-20 18:38:18 +01:00 |
|
Roger Braun
|
ebf9fe6a98
|
Pull in persistence plugin, don't blow up on full storage.
|
2017-02-20 18:25:19 +01:00 |
|
Roger Braun
|
9763009d86
|
Merge branch 'feature/mutes' into develop
|
2017-02-20 18:06:01 +01:00 |
|
Roger Braun
|
8429de22e8
|
Remove notification persistence for now.
Seems to blow things up.
|
2017-02-20 18:02:50 +01:00 |
|
Roger Braun
|
9c1093b6ca
|
Grab mutes from server on patched servers.
|
2017-02-20 18:01:45 +01:00 |
|
Roger Braun
|
3fd0d0d1cb
|
Revert "Remove state persistence for now."
This reverts commit 9cf438f1b2.
|
2017-02-20 17:49:43 +01:00 |
|
lambadalambda
|
f40653a49d
|
Merge branch 'equal-padding' into 'develop'
set top and bottom padding on the bars to be equal because it was too top-heavy
See merge request !24
|
2017-02-20 10:37:47 -05:00 |
|
hakui
|
b29a094e38
|
set top and bottom padding on the bars to be equal because it was too top-heavy
|
2017-02-20 09:28:50 -06:00 |
|
lambadalambda
|
5a9f71c1ef
|
Merge branch 'feature/mobile_timeline_fills_full_width' into 'develop'
Make timeline use full width on mobile
See merge request !23
|
2017-02-20 05:59:38 -05:00 |
|