Commit graph

3473 commits

Author SHA1 Message Date
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
Roger Braun
c7a375068d Basic mobile panel switcher. 2017-01-17 17:27:39 +01:00
Roger Braun
4213d84b4d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-01-17 14:49:16 +01:00
Roger Braun
3be7a3ea85 Align style switcher. 2017-01-17 14:41:13 +01:00
lambadalambda
6811112c07 Merge branch 'feature/autodeploy' into 'develop'
add deploy task

See merge request !13
2017-01-17 08:31:33 -05:00
Roger Braun
cd8d5e0889 add deploy task 2017-01-17 14:27:42 +01:00
Roger Braun
ef094764cb Fix avatar size. 2017-01-17 13:27:11 +01:00
Roger Braun
77c51fdadb Set the viewport for mobile devices. 2017-01-17 09:09:12 +01:00
Roger Braun
d644887d4c Add styleSwitcher. 2017-01-16 18:57:03 +01:00
Roger Braun
afd90b84d0 User card background css fix. 2017-01-16 17:46:22 +01:00
Roger Braun
b65a29aa07 Dynamic style setting. 2017-01-16 17:44:26 +01:00
Roger Braun
1687d7de2e Add some half-transparent border under main content. 2017-01-15 19:27:23 +01:00
Roger Braun
198eee82be Merge branch 'develop' into feature/hash-routed 2017-01-15 18:56:27 +01:00
Roger Braun
4448f36f62 User profile css fix. 2017-01-15 16:26:37 +01:00
Roger Braun
224fe580ca Merge branch 'develop' into feature/hash-routed 2017-01-15 15:59:28 +01:00
Roger Braun
6c5b5eb52b Border css fix. 2017-01-15 15:53:55 +01:00
Roger Braun
65c7ad1269 Use solarized-light by default. 2017-01-15 15:50:34 +01:00
Roger Braun
fc7e13e7bb Add styling with base16.
Solarized-dark for now.
2017-01-15 15:44:56 +01:00
Roger Braun
929d4d75b4 Use hash routing. 2017-01-02 22:30:11 +01:00
Roger Braun
590782701d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-01-01 18:12:20 +01:00
lambadalambda
eac8fe0c33 Merge branch 'feature/follow' into 'develop'
Feature/follow

See merge request !11
2017-01-01 12:11:55 -05:00
Roger Braun
c1d0b04105 Make minVisibleId actually dependent on visible statuses. 2017-01-01 18:10:25 +01:00
Roger Braun
8f494b14f0 Add unfollowing. 2016-12-23 16:45:57 +01:00
Roger Braun
2088b3c4dd Add returned user to store after following. 2016-12-23 16:16:02 +01:00
lambadalambda
0db25bdca0 Merge branch 'fix/refactoring_status_delete' into 'develop'
Move delete button for status into a component

See merge request !8
2016-12-20 14:50:16 -05:00
Jiayi Zheng
d98f730921 Fixes currentUser rights 2016-12-19 17:03:02 +01:00
Jiayi Zheng
ed0d02b0ad Merge branch 'develop' into fix/refactoring_status_delete 2016-12-08 20:29:06 +01:00
Jiayi Zheng
c24e44a8f2 Fixes user right check 2016-12-08 20:26:05 +01:00
lambadalambda
224488ea12 Merge branch 'artifacts' into 'develop'
add artifacts

See merge request !9
2016-12-08 10:00:00 -05:00
Roger Braun
213316e68f add artifacts 2016-12-08 15:55:12 +01:00
Roger Braun
7978ffeb1d Check all statuses in timeline for old retweets.
This will fix the problem of retweets showing up again and again.
2016-12-08 12:45:09 +01:00
Roger Braun
fc268c48bc Very basic user following. 2016-12-08 09:09:21 +01:00
Roger Braun
f18f87747f Also add retweeted users to user store. 2016-12-08 09:08:59 +01:00
Jiayi Zheng
1c75feae60 Move delete button for status into a component 2016-12-07 21:50:46 +01:00
Roger Braun
7b5a30db14 Work around hotlinking restrictions. 2016-12-07 09:34:48 +01:00
Roger Braun
026ab7c1df Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2016-12-05 20:49:58 +01:00