Commit graph

5189 commits

Author SHA1 Message Date
Sebastian Huebner
0320f03cd2
make linter happy 2017-11-07 18:43:28 +01:00
Sebastian Huebner
1b281303b5 Merge branch 'feature/ger-translation' of git.pleroma.social:pleroma/pleroma-fe into feature/ger-translation 2017-11-07 18:38:25 +01:00
Sebastian Huebner
8a3118d1a7 added ger translation 2017-11-07 18:37:51 +01:00
Roger Braun
33ad62bf72 Japanese is ja. 2017-11-07 18:34:12 +01:00
Sebastian Huebner
708a338855
rebase 2017-11-07 18:33:53 +01:00
Sebastian Huebner
df895b0510 added ger translation 2017-11-07 18:26:24 +01:00
Sebastian Huebner
4d4282a759
added ger translation 2017-11-07 18:22:25 +01:00
Roger Braun
71395ebca2 Add japanese translation.
Thanks, https://knzk.me/@imncls!
2017-11-07 18:20:40 +01:00
lambda
2354255615 Merge branch 'feature/fi-language' into 'develop'
Add fi to localization.

See merge request pleroma/pleroma-fe!127
2017-11-07 16:58:46 +00:00
Shpuld Shpludson
f89f120c44 Add fi to localization. 2017-11-07 16:55:08 +00:00
Roger Braun
ed18d44e19 update readme 2017-11-07 17:12:32 +01:00
Roger Braun
8fb83502f0 Add translation to readme. 2017-11-07 15:42:34 +01:00
Roger Braun
74b513122e Set locale from browser settings. 2017-11-07 15:23:00 +01:00
Roger Braun
7516cd859f Prepare for i18n. 2017-11-07 15:14:37 +01:00
lambda
81b0849889 Merge branch 'fix/friendica-html' into 'develop'
Fix issue #33

Closes #33

See merge request pleroma/pleroma-fe!126
2017-11-07 10:33:02 +00:00
Shpuld Shpuldson
acde0b316c Changes inside status html: restrict image/video sizes, make blockquotes waste less space. 2017-11-07 12:22:33 +02:00
lambda
e74e725750 Merge branch 'fix/authenticated-remote-profile-fetching' into 'develop'
Send credentials when fetching remote profile.

See merge request pleroma/pleroma-fe!125
2017-11-06 22:37:00 +00:00
eal
784eb8426c Send credentials when fetching remote profile. 2017-11-07 00:20:51 +02:00
lambda
9fedcab988 Merge branch 'fix/update-readme-new-repo' into 'develop'
Update README.md

See merge request pleroma/pleroma-fe!124
2017-11-06 13:27:25 +00:00
Shpuld Shpludson
9eaf7087a3 Update dual boot link in README.md for new repo 2017-11-02 15:26:28 +00:00
lambda
fb8b625d9a Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'
Stop inappropriate auto fetching on scroll

See merge request pleroma/pleroma-fe!123
2017-11-02 14:59:31 +00:00
lambda
302c46741d Merge branch 'fix/disable-select-on-icons' into 'develop'
Disable text selection on icons and buttons

See merge request pleroma/pleroma-fe!122
2017-11-02 14:49:23 +00:00
Shpuld Shpuldson
bfb1b3f10b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/stop-inappropriate-scroll-auto-fetch 2017-11-02 16:48:01 +02:00
Shpuld Shpuldson
4cba955fca Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/disable-select-on-icons 2017-11-02 16:41:15 +02:00
Shpuld Shpuldson
f897c656fc Also disable select on buttons 2017-11-02 16:27:34 +02:00
Shpuld Shpuldson
10bc83018c Deregister scroll listener properly, only fetch more if timeline is visible. 2017-11-02 16:26:17 +02:00
lambda
6e611f4039 Update .gitlab-ci.yml 2017-11-02 14:20:00 +00:00
Shpuld Shpuldson
226f435a17 Add user-select: none to i elements. 2017-11-02 11:27:52 +02:00
lambadalambda
63473964f8 Merge branch 'feature/emoji-completion' into 'develop'
Add emoji completion

See merge request lambadalambda/pleroma-fe!122
2017-10-25 10:00:28 -04:00
eal
ba9b04a8ba Use the API endpoint for emoji completion. 2017-10-19 23:39:21 +03:00
eal
447ec91176 Actually actually fix image url. 2017-09-19 22:58:15 +03:00
eal
f4b1319eff Actually fix image url. 2017-09-19 22:54:54 +03:00
eal
70d66c48ad Fix image url. 2017-09-19 22:50:08 +03:00
eal
2162ef20b0 Add emoji completion. 2017-09-19 22:43:20 +03:00
lambadalambda
91991e2ac1 Merge branch 'feature/tag-timelines' into 'develop'
Add tag timeline view.

See merge request !121
2017-09-17 07:58:05 -04:00
eal
c96a7b582b Remove another cache file. 2017-09-17 14:42:04 +03:00
eal
59f07c0704 Remove cache file. 2017-09-17 14:37:48 +03:00
eal
9abfcb34ef Add tag timeline view. 2017-09-17 14:26:35 +03:00
lambadalambda
3eaaa4c16d Merge branch 'fix/set-cookie' into 'develop'
Set cookies on fetch

See merge request !114
2017-09-13 04:47:23 -04:00
lambadalambda
7abcb13ec0 Merge branch 'feature/login-with-cookie' into 'develop'
Try logging in with the existing cookie.

See merge request !116
2017-09-13 04:47:03 -04:00
lambadalambda
c6b909570a Merge branch 'fix/upload-buttons-clickable' into 'develop'
Fix hide and cancel buttons on chromium

See merge request !119
2017-09-13 04:46:24 -04:00
lambadalambda
e7691bff82 Merge branch 'fix/responsive-user-search' into 'develop'
Make user finder more pleasant.

See merge request !120
2017-09-13 04:46:06 -04:00
eal
5e6ffc0e45 Make user finder more pleasant. 2017-09-10 20:46:42 +03:00
eal
8a51bc6e22 Fix hide and cancel buttons on chromium 2017-09-10 13:33:02 +03:00
lambadalambda
9c7eb1de3c Merge branch 'feature/follow-notif-tests' into 'develop'
Add tests for follow notifications.

See merge request !115
2017-09-04 02:51:06 -04:00
lambadalambda
00f8857876 Merge branch 'fix/timeago-months' into 'develop'
Better specifier for months

See merge request !112
2017-09-03 19:00:42 -04:00
Shpuld Shpuldson
b35acf4628 Merge branch 'fix/usercard-css' into 'develop'
Fix/usercard css

See merge request !110
2017-09-03 01:20:46 -04:00
eal
298bf5cfca Revert "Include cookie in every request"
This reverts commit 00589a9af1.
Changing same-origin to the unsafer include did not fix the
bug it was supposed to.
2017-09-02 21:12:55 +03:00
Roger Braun
8b4f59e1f7 Try logging in with the existing cookie. 2017-09-02 19:50:02 +03:00
eal
00589a9af1 Include cookie in every request 2017-09-02 19:29:45 +03:00