Commit Graph

1684 Commits

Author SHA1 Message Date
HJ
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
Egor Kislitsyn
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
Egor Kislitsyn
b3455649c5 improve notification subscription 2018-12-13 18:04:09 +07:00
HJ
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
Henry Jameson
9f48055261 Fix typo that prevented scope copy from working. 2018-12-13 13:34:47 +03:00
HJ
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
ValD
ce6d75331b added check for activatePanel is function or not 2018-12-13 00:56:04 +05:30
HJ
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
HJ
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
HJ
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
ValD
481c5ecba8 addressed PR comments 2018-12-13 00:14:47 +05:30
ValD
e3848f6efb activate panel on user screen click 2018-12-13 00:13:47 +05:30
ValD
b271957b4c added not preload check so hidden toggles asap 2018-12-13 00:11:01 +05:30
ValD
33b962b13e removed counters from left panel 2018-12-12 23:56:12 +05:30
ValD
7556efa04f added router-links to all relavent links 2018-12-12 23:34:22 +05:30
ValD
1623dcb417 added activatePanel onclick for timeago button 2018-12-12 23:34:22 +05:30
ValD
7c6c2cfb22 added PR comments 2018-12-12 23:29:13 +05:30
Egor Kislitsyn
02c0e15781 add checkbox to disable web push 2018-12-13 00:03:50 +07:00
ValD
6d3bd95bfe removed brackets from condition 2018-12-12 15:07:07 +00:00
ValD
de5d846ebd resolved lint issue 2018-12-12 03:44:45 +05:30
ValD
139659d42c renamed config to preload images and add ident to config 2018-12-12 03:42:29 +05:30
ValD
7b4e08dd93 added config for preload and made attachment responsive to it 2018-12-12 03:33:53 +05:30
ValD
b195ce12e1 preload nsfw image 2018-12-12 02:28:36 +05:30
HJ
a8acba8cb2 Merge branch 'feature/theming2' into 'develop'
Themes v2

See merge request pleroma/pleroma-fe!377
2018-12-11 20:35:19 +00:00
Henry Jameson
8fcc4c6766 fix 2018-12-11 19:09:00 +03:00
Henry Jameson
c3f8b713a7 fixed wrong height for selects 2018-12-11 16:37:03 +03:00
Henry Jameson
83b85cd412 better layouting for import-export, error display fixes 2018-12-11 16:36:27 +03:00
Henry Jameson
c189a08dff added keep-colors option 2018-12-11 16:36:06 +03:00
Henry Jameson
51dccb7887 separated preview and exported from style_switcher 2018-12-11 02:46:17 +03:00
Henry Jameson
a17ac74df7 revert that, it's actually used, i'm an idiot 2018-12-11 02:05:22 +03:00
Henry Jameson
90a5670661 removed unused function from color_convert 2018-12-11 01:41:19 +03:00
Henry Jameson
73aa9153d9 cleanup 2018-12-11 01:40:19 +03:00
Henry Jameson
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
Henry Jameson
fe2fe09236 fixed v2 setting as default theme 2018-12-11 01:38:20 +03:00
Henry Jameson
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
Henry Jameson
aeecd2b09b separate font control js 2018-12-11 00:56:15 +03:00
Egor Kislitsyn
ee70ec4c7e fix race condition 2018-12-10 22:36:25 +07:00
Egor Kislitsyn
73b17d70ec improve push notifications code 2018-12-09 19:25:43 +07:00
lambda
fb5261b926 Merge branch 'hideISP' into 'develop'
Add user configuration option to hide instance-specific panel

Closes #196

See merge request pleroma/pleroma-fe!402
2018-12-08 10:05:16 +00:00
Egor Kislitsyn
11716a7a53 second attempt to add subscribe module and fix race condition 2018-12-07 20:13:36 +07:00
Egor Kislitsyn
a85d128d37 Revert "add subscribe module and fix race condition"
This reverts commit 07f1b8523e.
2018-12-07 18:53:40 +07:00
Egor Kislitsyn
07f1b8523e add subscribe module and fix race condition 2018-12-07 18:13:04 +07:00
Egor Kislitsyn
264da19f69 fix typo 2018-12-07 15:21:19 +07:00
Egor Kislitsyn
bbae2e10f3 Add configuration to enable/disable web push notifications 2018-12-07 15:15:31 +07:00
Egor Kislitsyn
ebe2a95140 improve web push notifications 2018-12-07 14:57:35 +07:00
HJ
0cb3c4e056 Merge branch 'better_errors_on_registration' into 'develop'
Registration form: Client side validation + better display of server validation errors

See merge request pleroma/pleroma-fe!399
2018-12-06 17:39:38 +00:00
Egor Kislitsyn
09147cacea add service worker and push notifications 2018-12-06 20:34:00 +07:00
raeno
8987c3025d Fix color fallback order 2018-12-05 23:35:15 +04:00
raeno
e3d0917db8 Use console.warn instead of console.log 2018-12-05 23:13:08 +04:00
raeno
a3e19cbafa Get rid of mutation_types file, use inline approach. Minor fixes 2018-12-05 23:07:58 +04:00