Commit Graph

6358 Commits

Author SHA1 Message Date
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
lambadalambda 8aea394980 Update .gitlab-ci.yml 2017-02-16 07:44:09 -05:00
Roger Braun e892fffda7 Correctly calculate the newStatusesCount.
Fixes a bug when viewing an updating twkn while logged in.
2017-02-16 12:51:24 +01:00
Roger Braun 06021f4971 Add .node-version 2017-02-16 12:51:08 +01:00
Roger Braun 832bd3cdd2 Fetch Public and TWKN timelines when viewed. 2017-02-16 11:17:47 +01:00
lambadalambda 14f07dde5d Update .gitlab-ci.yml 2017-02-15 14:46:24 -05:00
Roger Braun 370468bd6a Persist users. 2017-02-14 22:42:13 +01:00
Roger Braun 1d64b76211 Add basic configuration module, make it work for title and theme. 2017-02-14 22:21:23 +01:00
Roger Braun 340b21475d Make temporarily unmuted posts hideable again. 2017-02-14 21:47:37 +01:00
Roger Braun c402478cca Update font. 2017-02-14 21:46:26 +01:00
Roger Braun 4c12de262f Add muting to statuses. 2017-02-14 00:01:50 +01:00
Roger Braun 66ef9f1328 Add users muting. 2017-02-13 23:22:32 +01:00
Roger Braun f9b3f8df84 Add all_following endpoint. 2017-02-13 22:55:38 +01:00
Roger Braun 319af91a47 Merge branch 'develop' into feature/hash-routed 2017-02-05 23:37:56 +01:00
Roger Braun 038798f3f4 Prefer local image if available. 2017-02-05 23:37:24 +01:00
Roger Braun 670298cca1 Merge branch 'develop' into feature/hash-routed 2017-02-04 13:57:24 +01:00
Roger Braun 2269e815e1 Make status expandable into conversation. 2017-02-04 13:53:28 +01:00
Roger Braun b420b5838c Use statusOrConversation component in timeline. 2017-02-04 13:53:16 +01:00
Roger Braun 800b051a16 Add statusOrConversation component. 2017-02-04 13:53:07 +01:00
Roger Braun 5ec4f1b047 Extract conversation and create conversation page. 2017-02-04 13:52:26 +01:00
Roger Braun ea25708bf3 Set color on status instead of on timeline. 2017-02-04 13:51:44 +01:00
Roger Braun 5a518fa817 Break after user name in notifications. 2017-01-26 12:03:07 +01:00
Roger Braun b98a6fe5bc Fix file uploads in Chrome. 2017-01-21 00:00:05 +01:00
Roger Braun e81b3ea245 Fix style setting in Chrome. 2017-01-20 23:59:54 +01:00
Roger Braun 51473f0484 Fix file uploads in Chrome. 2017-01-20 23:58:58 +01:00
Roger Braun 1a5ec7484e Fix style setting in Chrome. 2017-01-20 23:39:38 +01:00
lambadalambda 4314b48924 Update README.md 2017-01-19 11:51:27 -05:00
Roger Braun c6f266302f Merge branch 'develop' into feature/hash-routed 2017-01-17 20:55:53 +01:00