HJ
99b2b7a203
Merge branch 'feature/file-size-checking' into 'develop'
...
[pleroma#36] Add errors when file uploading fails
See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
Henry Jameson
f87001c22f
fix old MR
2018-12-13 20:25:46 +03:00
Shpuld Shpludson
dbe79a3c26
Merge branch 'dev-qol' into 'develop'
...
Several fixes to make life of contributors a tiny bit easier.
See merge request pleroma/pleroma-fe!409
2018-12-13 14:42:58 +00:00
Rinpatch
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
Henry Jameson
c54eb1ecad
fix
2018-12-11 19:01:08 +03:00
Henry Jameson
b839ba7870
Quality of Frontend Developer's Life: here to stay
2018-12-11 18:45:25 +03:00
Egor Kislitsyn
ee70ec4c7e
fix race condition
2018-12-10 22:36:25 +07:00
rinpatch
788383d8a1
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:56:00 +01:00
Rinpatch
ba188eddab
[pleroma#36] Add upload errors
2018-12-08 18:23:21 +03:00
Maxim Filippov
79d864c3f2
Move routes to the separate file -> make it testable
2018-12-06 22:09:54 +03:00
Egor Kislitsyn
09147cacea
add service worker and push notifications
2018-12-06 20:34:00 +07:00
Henry Jameson
c241de4634
fix
2018-12-05 10:51:11 +03:00
Henry Jameson
e06717fd0d
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
2018-11-26 04:38:44 +03:00
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01:00
Roger Braun
b37a0f4f23
Add direct message tab.
2018-11-13 20:34:56 +01:00
Roger Braun
50264410f5
Add login form back in.
2018-11-07 16:56:12 +01:00
Roger Braun
b6cd4ff32a
Fix typo.
2018-11-06 21:47:11 +01:00
Roger Braun
fbe30b4922
Merge remote-tracking branch 'origin/develop' into oauth
2018-10-26 16:13:05 +02:00
Roger Braun
9af204b293
Move login to oauth.
2018-10-26 15:16:23 +02:00
