Commit Graph

5549 Commits

Author SHA1 Message Date
Roger Braun
ccbfc64bfc Don't redirect after login. 2017-03-08 16:54:06 +01:00
wakarimasen
7d52258378 Move rejection handler 2017-03-07 21:38:55 +01:00
Shpuld Shpuldson
d954db0221 Merge branch 'feature/timeline-fetch-error' into 'develop'
Visual feedback on failure to fetch new statuses

See merge request !47
2017-03-07 12:15:37 -05:00
lambadalambda
3a62ad3c4c Merge branch 'feature/more-visible-notifications' into 'develop'
Notifications inside a red circle and the red line more visible

See merge request !46
2017-03-07 11:27:46 -05:00
wakarimasen
086dd832d3 Visual feedback on failure to fetch new statuses 2017-03-07 17:27:12 +01:00
lambadalambda
1057227be3 Merge branch 'fix/collapse-on-same-line' into 'develop'
Put conversation 'Collapse' back on the same line with the rest of the heading.'

See merge request !45
2017-03-07 10:15:41 -05:00
shpuld
ae570ea0ff Put conversation 'Collapse' back on the same line with the rest of the heading.' 2017-03-07 16:00:45 +02:00
shpuld
58fdf9e70d Put the number of notifications inside a red circle (kinda like qvitter and everyone else does), make the red notification line slightly less transparent. 2017-03-07 15:55:00 +02:00
lambadalambda
aa0d207c94 Merge branch 'fix/highlight-expanded-retweets' into 'develop'
Highlight original notice when expanding retweets

See merge request !43
2017-03-07 06:06:43 -05:00
Roger Braun
e64a5beb35 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-03-07 08:44:53 +01:00
Roger Braun
5143ae7f72 Switch to localforage to use indexeddb by default. 2017-03-07 08:43:48 +01:00
Shpuld Shpuldson
34531de8c0 Merge branch 'fix/overlapping-styles-user-card' into 'develop'
Fix overlapping styles in timeline and notifications that screwed up user-card.

See merge request !44
2017-03-06 16:55:48 -05:00
shpuld
a4ebf44f24 Fix overlapping styles in timeline and notifications that screwed up user-card. 2017-03-06 23:51:39 +02:00
Roger Braun
990047725a Revert "Temporarily remove persistence."
This reverts commit 0bb1ec30d0.
2017-03-06 19:57:00 +01:00
Roger Braun
0bb1ec30d0 Temporarily remove persistence. 2017-03-06 19:55:08 +01:00
wakarimasen
9d56721533 Highlight original notice when expanding retweets 2017-03-06 16:21:11 +01:00
lambadalambda
eab4b76951 Merge branch 'feature/load-new-statuses-in-heading' into 'develop'
Improvements in loading statuses interface

See merge request !42
2017-03-06 07:58:32 -05:00
shpuld
31c0a2dfef Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading 2017-03-06 14:51:01 +02:00
lambadalambda
67c22276d3 Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop'
Wakarimasen/pleroma fe highlight notice

See merge request !41
2017-03-05 14:59:33 -05:00
Roger Braun
51160f0fdb Style fixes. 2017-03-05 20:36:22 +01:00
shpuld
e19bfb9a22 Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else. 2017-03-05 19:00:35 +02:00
wakarimasen
42ae57dace Remove unused import 2017-03-05 16:49:45 +01:00
wakarimasen
289326855c Add focused prop to status 2017-03-05 16:31:01 +01:00
wakarimasen
c921662036 Add inConversation prop to status 2017-03-05 14:34:14 +01:00
wakarimasen
22e8258a56 Highlight current notice in conversation-page, add backlinks 2017-03-05 11:56:28 +01:00
wakarimasen
6bcbed38d0 Add option to only hide attachments on timeline 2017-03-04 21:25:59 +01:00
lambadalambda
049c74f8e8 Merge branch 'feature/better-nsfw-image-loading' into 'develop'
issue #1 - better nsfw image loading

See merge request !37
2017-03-03 05:00:06 -05:00
xj9
9107facaca issue #1 - better nsfw image loading
preload the image when it is toggled, but wait to replace it until
it has loaded.
2017-03-02 20:01:19 -07:00
Shpuld Shpuldson
6075915223 Merge branch 'feature/restructure-timelines' into 'develop'
Unify notice timelines to make changes easier.

See merge request !36
2017-03-01 16:58:42 -05:00
lambadalambda
bed37646f9 Update .gitlab-ci.yml 2017-03-01 14:46:07 -05:00
lambadalambda
30a908b56d Update .gitlab-ci.yml 2017-03-01 14:42:45 -05:00
Roger Braun
a4c58aab13 Unify notice timelines to make changes easier. 2017-03-01 20:36:37 +01:00
lambadalambda
51294082e0 Merge branch 'fix/improved-profile-background-color' into 'develop'
Make use of template literals instead of string concat.

See merge request !34
2017-03-01 11:14:18 -05:00
lambadalambda
5db70a212d Merge branch 'fix/remove-unread-notifications-offset' into 'develop'
Fix the very visible padding offset in unread notification caused by the border.

See merge request !35
2017-03-01 11:13:46 -05:00
shpuld
4d1183cc1f Fix the very visible padding offset in unread notification caused by the border. 2017-02-27 19:21:40 +02:00
shpuld
8c43b3f505 Remove newlines from template literal. 2017-02-26 22:42:22 +02:00
shpuld
015bf78dd9 Heading text floats left, initial attempt at load more in the right side of the heading. 2017-02-26 22:36:54 +02:00
Roger Braun
290180a987 Merge branch 'develop' into feature/hash-routed 2017-02-26 11:39:42 +01:00
shpuld
960ed9540d Make use of template literals instead of string concat. 2017-02-25 14:34:05 +02:00
lambadalambda
bebd5c3328 Merge branch 'fix/improved-profile-background-color' into 'develop'
Make the profile background use a new calculated color using the theme

See merge request !33
2017-02-25 06:33:14 -05:00
lambadalambda
e2ba7d9037 Merge branch 'fix/various-style-fixes-all-over-the-place' into 'develop'
Fix/various style fixes all over the place

See merge request !32
2017-02-25 06:32:19 -05:00
shpuld
e9820326e3 Clean up whitespace 2017-02-25 13:19:37 +02:00
shpuld
536a7176df Make the profile background use a new calculated color using the theme 2017-02-25 13:13:08 +02:00
lambadalambda
614cbb556a Remove old commented style. 2017-02-24 16:50:32 -05:00
shpuld
142a8a1a76 Fix poor choice of colors for input/textarea borders, adjust login form padding. 2017-02-24 19:43:27 +02:00
shpuld
cac47f7128 Make user card buttons more light-theme friendly without compromising the dark ones. 2017-02-24 19:12:57 +02:00
shpuld
2bfd2190a0 Mark unread notifs with the red line, make read notifs base01 again, center the heading text and move the button to the right of the panel. 2017-02-24 18:53:53 +02:00
shpuld
9dfcf8a301 Align attachments with usercard, make buttons use theme colors, prettify login form, more border radii adjustment for consistency. 2017-02-24 17:32:41 +02:00
shpuld
e0e507348c Give buttons cursor: pointer; Make border radii more consistent by not using em everywhere. 2017-02-24 10:17:41 +02:00
Roger Braun
2b2061b03f Switch to lz-string.
Pako was very slow in Chromium.
2017-02-23 19:11:22 +01:00