dd6a9ae645
oof
2018-12-13 17:51:29 +03:00
457132fb37
get rid of slots
2018-12-13 15:44:37 +01:00
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
8e4777ccc6
Merge branch 'feature/push-subscriptions' into 'develop'
...
add service worker and push notifications
See merge request pleroma/pleroma-fe!404
2018-12-13 13:46:57 +00:00
a8521fc8d9
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
...
# Conflicts:
# src/i18n/en.json
# src/modules/interface.js
# src/modules/users.js
# yarn.lock
2018-12-13 18:22:15 +07:00
b3455649c5
improve notification subscription
2018-12-13 18:04:09 +07:00
e443716bcd
Merge branch 'fix-scope-copy' into 'develop'
...
Fix typo that prevented scope copy from working.
Closes #214
See merge request pleroma/pleroma-fe!413
2018-12-13 10:39:50 +00:00
9f48055261
Fix typo that prevented scope copy from working.
2018-12-13 13:34:47 +03:00
48edc0c8fc
Refactor arrays to individual options
2018-12-13 11:25:03 +03:00
2077927ff3
Merge branch 'dev_vald_fe/user_name_panel' into 'develop'
...
activate panel on user screen click
See merge request pleroma/pleroma-fe!408
2018-12-12 19:31:15 +00:00
ce6d75331b
added check for activatePanel is function or not
2018-12-13 00:56:04 +05:30
7325ff2e7a
Merge branch 'dev_vald_fe/nsfw_preload' into 'develop'
...
preload nsfw image
Closes #193
See merge request pleroma/pleroma-fe!411
2018-12-12 19:01:53 +00:00
f0fb6e6015
Merge branch 'dev_vald_fe/timeago_panel' into 'develop'
...
added activatePanel onclick for timeago button
See merge request pleroma/pleroma-fe!407
2018-12-12 18:47:56 +00:00
13ef05d5e6
Merge branch 'dev_vald_fe/user_panel_counts' into 'develop'
...
removed user_panel counts
See merge request pleroma/pleroma-fe!410
2018-12-12 18:47:09 +00:00
481c5ecba8
addressed PR comments
2018-12-13 00:14:47 +05:30
e3848f6efb
activate panel on user screen click
2018-12-13 00:13:47 +05:30
b271957b4c
added not preload check so hidden toggles asap
2018-12-13 00:11:01 +05:30
33b962b13e
removed counters from left panel
2018-12-12 23:56:12 +05:30
7556efa04f
added router-links to all relavent links
2018-12-12 23:34:22 +05:30
1623dcb417
added activatePanel onclick for timeago button
2018-12-12 23:34:22 +05:30
7c6c2cfb22
added PR comments
2018-12-12 23:29:13 +05:30
fa7fbe05de
Write a unit test for fileSizeFormatService
2018-12-12 20:41:12 +03:00
02c0e15781
add checkbox to disable web push
2018-12-13 00:03:50 +07:00
9c24ac1d05
I am dumb
2018-12-12 20:01:37 +03:00
5ca2e75df3
Handle errors from server
2018-12-12 19:31:16 +03:00
6d3bd95bfe
removed brackets from condition
2018-12-12 15:07:07 +00:00
bf8bb9ce13
Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
2018-12-12 16:38:01 +03:00
de5d846ebd
resolved lint issue
2018-12-12 03:44:45 +05:30
139659d42c
renamed config to preload images and add ident to config
2018-12-12 03:42:29 +05:30
7b4e08dd93
added config for preload and made attachment responsive to it
2018-12-12 03:33:53 +05:30
b195ce12e1
preload nsfw image
2018-12-12 02:28:36 +05:30
a8acba8cb2
Merge branch 'feature/theming2' into 'develop'
...
Themes v2
See merge request pleroma/pleroma-fe!377
2018-12-11 20:35:19 +00:00
8fcc4c6766
fix
2018-12-11 19:09:00 +03:00
c3f8b713a7
fixed wrong height for selects
2018-12-11 16:37:03 +03:00
83b85cd412
better layouting for import-export, error display fixes
2018-12-11 16:36:27 +03:00
c189a08dff
added keep-colors option
2018-12-11 16:36:06 +03:00
25a04f2294
Avatar, background, banner filesize errors
2018-12-11 16:02:35 +03:00
51dccb7887
separated preview and exported from style_switcher
2018-12-11 02:46:17 +03:00
a17ac74df7
revert that, it's actually used, i'm an idiot
2018-12-11 02:05:22 +03:00
90a5670661
removed unused function from color_convert
2018-12-11 01:41:19 +03:00
73aa9153d9
cleanup
2018-12-11 01:40:19 +03:00
4b25475b57
setColors -> applyTheme. For sanity. Also disabled export because nobody uses it
...
and should not use anyway.
2018-12-11 01:39:18 +03:00
fe2fe09236
fixed v2 setting as default theme
2018-12-11 01:38:20 +03:00
3452864260
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop:
Fix color fallback order
Use console.warn instead of console.log
Get rid of mutation_types file, use inline approach. Minor fixes
Add fallback color rule.
Change english validation error messages
Clean up the code
Validate name presence on client-side as well
Better styling for client-side validation. Add I18n for validation errors.
Fix broken ToS link. Fix linter errors
Add client validation for registration form
Use Array.reduce instead of lodash.reduce
Humanize validation errors returned on registration
Added user option to hide instance-specific panel, rearranged config screen to better categorize it / adjustments to language selector
fix
2018-12-11 01:01:16 +03:00
aeecd2b09b
separate font control js
2018-12-11 00:56:15 +03:00
ee70ec4c7e
fix race condition
2018-12-10 22:36:25 +07:00
6a00854189
Count in binary bytes and remove i18 from file size format service
2018-12-10 17:06:32 +03:00
88145c5934
Add a space between filesizes
2018-12-10 10:04:42 +03:00
5c7a316df9
Lint
2018-12-10 09:56:07 +03:00
c69a8dc197
Add file size formating
2018-12-10 09:50:04 +03:00
Rinpatch