| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'hide_network' into 'develop' | Shpuld Shpludson | 2018-12-13 |
| |\ | | | | | | | | | FE part of pleroma!490 See merge request pleroma/pleroma-fe!415 | ||
| | * | added hide_network option, fixed properties naming | Henry Jameson | 2018-12-13 |
| | | | |||
| * | | Merge branch 'fix-timeago' into 'develop' | HJ | 2018-12-13 |
| |\ \ | | | | | | | | | | | | | fix timeago font See merge request pleroma/pleroma-fe!416 | ||
| | * | | fix timeago font | Henry Jameson | 2018-12-13 |
| |/ / | |||
| * | | Merge branch 'feature/push-subscriptions' into 'develop' | HJ | 2018-12-13 |
| |\ \ | |/ |/| | | | | | add service worker and push notifications See merge request pleroma/pleroma-fe!404 | ||
| | * | Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into ↵ | Egor Kislitsyn | 2018-12-13 |
| | |\ | |/ |/| | | | | | | | | | | | | | | | feature/push-subscriptions # Conflicts: # src/i18n/en.json # src/modules/interface.js # src/modules/users.js # yarn.lock | ||
| * | | Merge branch 'fix-scope-copy' into 'develop' | HJ | 2018-12-13 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix typo that prevented scope copy from working. Closes #214 See merge request pleroma/pleroma-fe!413 | ||
| | * | | Fix typo that prevented scope copy from working. | Henry Jameson | 2018-12-13 |
| | | | | |||
| * | | | Merge branch 'dev_vald_fe/user_name_panel' into 'develop' | HJ | 2018-12-12 |
| |\ \ \ | | | | | | | | | | | | | | | | | activate panel on user screen click See merge request pleroma/pleroma-fe!408 | ||
| | * | | | added check for activatePanel is function or not | ValD | 2018-12-13 |
| | | | | | |||
| | * | | | addressed PR comments | ValD | 2018-12-13 |
| | | | | | |||
| | * | | | activate panel on user screen click | ValD | 2018-12-13 |
| | | | | | |||
| * | | | | Merge branch 'dev_vald_fe/nsfw_preload' into 'develop' | HJ | 2018-12-12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preload nsfw image Closes #193 See merge request pleroma/pleroma-fe!411 | ||
| | * | | | | added not preload check so hidden toggles asap | ValD | 2018-12-13 |
| | | | | | | |||
| | * | | | | added PR comments | ValD | 2018-12-12 |
| | | | | | | |||
| | * | | | | removed brackets from condition | ValD | 2018-12-12 |
| | | | | | | |||
| | * | | | | resolved lint issue | ValD | 2018-12-12 |
| | | | | | | |||
| | * | | | | renamed config to preload images and add ident to config | ValD | 2018-12-12 |
| | | | | | | |||
| | * | | | | added config for preload and made attachment responsive to it | ValD | 2018-12-12 |
| | | | | | | |||
| | * | | | | preload nsfw image | ValD | 2018-12-12 |
| | |/ / / | |||
| * | | | | Merge branch 'dev_vald_fe/timeago_panel' into 'develop' | HJ | 2018-12-12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | added activatePanel onclick for timeago button See merge request pleroma/pleroma-fe!407 | ||
| | * | | | | added router-links to all relavent links | ValD | 2018-12-12 |
| | | | | | | |||
| | * | | | | added activatePanel onclick for timeago button | ValD | 2018-12-12 |
| | |/ / / | |||
| * | | | | Merge branch 'dev_vald_fe/user_panel_counts' into 'develop' | HJ | 2018-12-12 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | removed user_panel counts See merge request pleroma/pleroma-fe!410 | ||
| | * | | | removed counters from left panel | ValD | 2018-12-12 |
| |/ / / | |||
| * | | | Merge branch 'feature/theming2' into 'develop' | HJ | 2018-12-11 |
| |\ \ \ | |/ / |/| | | | | | | | | Themes v2 See merge request pleroma/pleroma-fe!377 | ||
| | * | | fix | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | fixed wrong height for selects | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | better layouting for import-export, error display fixes | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | added keep-colors option | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | separated preview and exported from style_switcher | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | revert that, it's actually used, i'm an idiot | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | removed unused function from color_convert | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | cleanup | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | setColors -> applyTheme. For sanity. Also disabled export because nobody uses it | Henry Jameson | 2018-12-11 |
| | | | | | | | | | | | | | and should not use anyway. | ||
| | * | | fixed v2 setting as default theme | Henry Jameson | 2018-12-11 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/develop' into feature/theming2 | Henry Jameson | 2018-12-11 |
| | |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||
| * | | | Merge branch 'hideISP' into 'develop' | lambda | 2018-12-08 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add user configuration option to hide instance-specific panel Closes #196 See merge request pleroma/pleroma-fe!402 | ||
| | * | | | Added user option to hide instance-specific panel, rearranged config screen to | Henry Jameson | 2018-12-05 |
| | | | | | | | | | | | | | | | | | better categorize it / adjustments to language selector | ||
| * | | | | Merge branch 'better_errors_on_registration' into 'develop' | HJ | 2018-12-06 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Registration form: Client side validation + better display of server validation errors See merge request pleroma/pleroma-fe!399 | ||
| | * | | | | Fix color fallback order | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Use console.warn instead of console.log | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Get rid of mutation_types file, use inline approach. Minor fixes | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Add fallback color rule. | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Change english validation error messages | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Clean up the code | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Validate name presence on client-side as well | raeno | 2018-12-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove email address validation, we have it covered by html itself and it's quite annoying * add shakeError animation * fix styles a bit | ||
| | * | | | | Better styling for client-side validation. Add I18n for validation errors. | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Fix broken ToS link. Fix linter errors | raeno | 2018-12-05 |
| | | | | | | |||
| | * | | | | Add client validation for registration form | raeno | 2018-12-05 |
| | | | | | | | | | | | | | | | | | | | | | * also extract registration logic to users.js module | ||
