Commit Graph

885 Commits

Author SHA1 Message Date
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
hakui
0faaeb02f3 fixed line-height for text box 2017-02-18 01:54:54 -06:00
hakui
734597b43f hello world 2017-02-18 01:48:35 -06:00
Roger Braun
9d0d1f7de1 Merge branch 'develop' into feature/hash-routed 2017-02-18 01:19:44 +01:00
Roger Braun
cd0925747d Show current theme in theme selector. 2017-02-17 18:21:02 +01:00
Roger Braun
cdc90f8edc One more fix. 2017-02-17 10:33:35 +01:00
Roger Braun
6c631016c6 One more small visual fix to oembeds. 2017-02-17 10:20:12 +01:00
Roger Braun
eb7156de0d Fix oembed attachments. 2017-02-17 10:16:29 +01:00
Roger Braun
2e874933a5 Navbar fixes. 2017-02-16 22:36:09 +01:00
Roger Braun
0be2051588 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-16 22:27:10 +01:00
Roger Braun
34bc38f0bf Add settings page to app. 2017-02-16 22:25:41 +01:00
Roger Braun
52dd7c009f Add Settings page. 2017-02-16 22:25:29 +01:00
Roger Braun
6de2dd041d Update font. 2017-02-16 22:25:20 +01:00
Roger Braun
f25ae61c5d Merge branch 'develop' into feature/hash-routed 2017-02-16 17:49:11 +01:00
Roger Braun
ce5b3d4c92 Add logo. 2017-02-16 17:44:36 +01:00
Roger Braun
a3b2be09b3 Add /cyb/ background by sonyam. 2017-02-16 16:59:06 +01:00
Roger Braun
d7c9261dab Prevent FOUC. 2017-02-16 16:07:07 +01:00
Roger Braun
ea03f3935e Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-16 16:00:23 +01:00
Roger Braun
5481cf00a3 Make user profiles visible inline. 2017-02-16 15:58:49 +01:00
Roger Braun
ae388d7927 Be strict about putting changes in mutations. 2017-02-16 14:23:59 +01:00
lambadalambda
2203585a79 Update .gitlab-ci.yml 2017-02-16 07:48:36 -05:00