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 |
|
shpuld
|
7e094a9880
|
Remove padding from timeline container and panel margins when in mobile mode
|
2017-02-20 12:46:20 +02:00 |
|
lambadalambda
|
a97f6a64ad
|
Update README.md
|
2017-02-19 16:15:42 -05:00 |
|
Roger Braun
|
fcb950fb43
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
|
2017-02-19 16:50:35 +01:00 |
|
Roger Braun
|
96b10a6e4c
|
Update vue.
|
2017-02-19 16:50:04 +01:00 |
|
lambadalambda
|
5d08c0d3c9
|
Update COFE_OF_CONDUCT.md
|
2017-02-19 10:08:57 -05:00 |
|
lambadalambda
|
a326cb6a74
|
Add cofe of conduct.
|
2017-02-19 09:55:23 -05:00 |
|
Roger Braun
|
9cf438f1b2
|
Remove state persistence for now.
Makes chrome really slow and adds problems with tab synchronization.
|
2017-02-19 14:25:31 +01:00 |
|
Roger Braun
|
2933dc30a5
|
Only display 10 notifications at a time, 20 is too much.
|
2017-02-19 13:37:21 +01:00 |
|
Roger Braun
|
56e036b4de
|
Add special case for mastodon user links.
They have a span embedded in the link, so let's look at the parent, too.
|
2017-02-19 13:25:30 +01:00 |
|
Roger Braun
|
04c4ad9a65
|
Open clicked links the statusnet_html in a new window.
|
2017-02-19 12:58:25 +01:00 |
|
Roger Braun
|
73f46bfba6
|
Merge branch 'clearnotifs' into develop
|
2017-02-19 12:28:36 +01:00 |
|
Roger Braun
|
8fb0ec985a
|
Fix button hover in Firefox.
|
2017-02-19 12:27:59 +01:00 |
|
Roger Braun
|
df3ffdd905
|
Follow style guide (https://github.com/feross/standard)
|
2017-02-19 12:19:47 +01:00 |
|
Roger Braun
|
5f74ae8de5
|
Revert "removed break-line for links because it didn't seem to make sense"
This reverts commit 2f4d811079.
|
2017-02-19 12:13:56 +01:00 |
|
lambadalambda
|
d45774b485
|
Merge branch 'feature/ctrl-enter_posts_status' into 'develop'
Ctrl-enter posts status
See merge request !21
|
2017-02-19 05:43:39 -05:00 |
|
shpuld
|
2639427236
|
Ctrl-enter posts status
|
2017-02-19 01:41:51 +02:00 |
|
hakui
|
af91346328
|
changed to if-else to save on one line
|
2017-02-18 17:38:56 -06:00 |
|
hakui
|
14237cff77
|
clears notif number from title when marking as read
|
2017-02-18 17:33:00 -06:00 |
|
lambadalambda
|
6dbdd322aa
|
Merge branch 'feature/top_bar_scrolls_to_top' into 'develop'
Feature/top bar scrolls to top
See merge request !19
|
2017-02-18 16:00:06 -05:00 |
|
shpuld
|
7b6719b96d
|
@click on top nav makes window scroll to top
|
2017-02-18 22:55:16 +02:00 |
|
Roger Braun
|
b5d7a179c4
|
Reverse title and notification count.
|
2017-02-18 21:43:26 +01:00 |
|
shpuld
|
e6f91badfb
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
|
2017-02-18 22:37:48 +02:00 |
|
Roger Braun
|
f7a38eb021
|
Don't cache node-modules.
|
2017-02-18 21:26:17 +01:00 |
|
lambadalambda
|
6f98543b79
|
Merge branch 'link-wraparound-styling' into 'develop'
(practicing the new branch thing) url styling
See merge request !18
|
2017-02-18 15:03:30 -05:00 |
|
lambadalambda
|
c2178819a0
|
Merge branch 'fix/prevent_follow_mute_button_deforming' into 'develop'
Fix follow/mute buttons from getting squished on mobile
See merge request !17
|
2017-02-18 15:02:31 -05:00 |
|
Roger Braun
|
209e8614b0
|
Don't add notifications twice + persiste them.
|
2017-02-18 20:56:03 +01:00 |
|
Roger Braun
|
963a0035e5
|
Make page title dynamic, better notification handling.
|
2017-02-18 20:44:41 +01:00 |
|
Roger Braun
|
d0281f5341
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
|
2017-02-18 20:44:33 +01:00 |
|
hakui
|
2aea6c4b09
|
increased leading for expanded view's header
|
2017-02-18 13:18:00 -06:00 |
|
hakui
|
1ccc9dd629
|
wrap long urls while not breaking normal words. also practicing the new branch thing
|
2017-02-18 12:51:47 -06:00 |
|
shpuld
|
8a0197d682
|
Fix follow/mute buttons from getting squished on mobile
|
2017-02-18 19:58:16 +02:00 |
|
shpuld
|
be2b90df1d
|
Fix follow and mute buttons from getting squished on mobile
|
2017-02-18 19:46:44 +02:00 |
|
lambadalambda
|
e111693b08
|
Update README.md
|
2017-02-18 11:49:34 -05:00 |
|
lambadalambda
|
d6d7d1820b
|
Update CONTRIBUTORS.md
|
2017-02-18 11:39:56 -05:00 |
|
lambadalambda
|
44b6a90fc5
|
Merge branch 'develop' into 'develop'
Make user card look neater
See merge request !16
|
2017-02-18 11:27:54 -05:00 |
|
shpuld
|
15c82dea62
|
moved around classes in the user-info css
|
2017-02-18 15:49:27 +02:00 |
|
shpuld
|
e86b1d71ee
|
Changed following-info to user-interactions and moved muting there, made everything in user-interactions look a bit neater
|
2017-02-18 15:48:27 +02:00 |
|
Roger Braun
|
35fc1fa7bd
|
Add lodash transformation to save a few kbs.
|
2017-02-18 13:39:10 +01:00 |
|
Roger Braun
|
4e366f27a1
|
Use percentages for main view flex-basis.
|
2017-02-18 13:02:50 +01:00 |
|
lambadalambda
|
7429ff986f
|
Update CONTRIBUTORS.md
|
2017-02-18 05:56:43 -05:00 |
|
lambadalambda
|
f47a0ff0ef
|
Merge branch 'develop' into 'develop'
Develop
See merge request !15
|
2017-02-18 05:44:29 -05:00 |
|
hakui
|
2f4d811079
|
removed break-line for links because it didn't seem to make sense
|
2017-02-18 03:10:02 -06:00 |
|
hakui
|
a4592445a3
|
making link thumbnails fit the whole box
|
2017-02-18 02:58:44 -06:00 |
|