aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into fix_empty_profilesHenry Jameson2018-12-13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (121 commits) improve notification subscription Fix typo that prevented scope copy from working. added check for activatePanel is function or not addressed PR comments activate panel on user screen click added not preload check so hidden toggles asap removed counters from left panel added router-links to all relavent links added activatePanel onclick for timeago button added PR comments add checkbox to disable web push removed brackets from condition resolved lint issue renamed config to preload images and add ident to config added config for preload and made attachment responsive to it preload nsfw image fix fixed wrong height for selects better layouting for import-export, error display fixes added keep-colors option ...
| * Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into ↵Egor Kislitsyn2018-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'HJ2018-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 Jameson2018-12-13
| | | |
| | * | Merge branch 'dev_vald_fe/user_name_panel' into 'develop'HJ2018-12-12
| | |\ \ | | | | | | | | | | | | | | | | | | | | activate panel on user screen click See merge request pleroma/pleroma-fe!408
| | | * | added check for activatePanel is function or notValD2018-12-13
| | | | |
| | | * | addressed PR commentsValD2018-12-13
| | | | |
| | | * | activate panel on user screen clickValD2018-12-13
| | | | |
| | * | | Merge branch 'dev_vald_fe/nsfw_preload' into 'develop'HJ2018-12-12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preload nsfw image Closes #193 See merge request pleroma/pleroma-fe!411
| | | * | | added not preload check so hidden toggles asapValD2018-12-13
| | | | | |
| | | * | | added PR commentsValD2018-12-12
| | | | | |
| | | * | | removed brackets from conditionValD2018-12-12
| | | | | |
| | | * | | resolved lint issueValD2018-12-12
| | | | | |
| | | * | | renamed config to preload images and add ident to configValD2018-12-12
| | | | | |
| | | * | | added config for preload and made attachment responsive to itValD2018-12-12
| | | | | |
| | | * | | preload nsfw imageValD2018-12-12
| | | |/ /
| | * | | Merge branch 'dev_vald_fe/timeago_panel' into 'develop'HJ2018-12-12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | added activatePanel onclick for timeago button See merge request pleroma/pleroma-fe!407
| | | * | | added router-links to all relavent linksValD2018-12-12
| | | | | |
| | | * | | added activatePanel onclick for timeago buttonValD2018-12-12
| | | |/ /
| | * / / removed counters from left panelValD2018-12-12
| | |/ /
| | * | fixed wrong height for selectsHenry Jameson2018-12-11
| | | |
| | * | better layouting for import-export, error display fixesHenry Jameson2018-12-11
| | | |
| | * | added keep-colors optionHenry Jameson2018-12-11
| | | |
| | * | separated preview and exported from style_switcherHenry Jameson2018-12-11
| | | |
| | * | revert that, it's actually used, i'm an idiotHenry Jameson2018-12-11
| | | |
| | * | removed unused function from color_convertHenry Jameson2018-12-11
| | | |
| | * | cleanupHenry Jameson2018-12-11
| | | |
| | * | setColors -> applyTheme. For sanity. Also disabled export because nobody uses itHenry Jameson2018-12-11
| | | | | | | | | | | | | | | | and should not use anyway.
| | * | fixed v2 setting as default themeHenry Jameson2018-12-11
| | | |
| | * | Merge remote-tracking branch 'upstream/develop' into feature/theming2Henry Jameson2018-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
| | * | separate font control jsHenry Jameson2018-12-11
| | | |
| | * | mobile fixesHenry Jameson2018-12-05
| | | |
| | * | Merge remote-tracking branch 'upstream/develop' into feature/theming2Henry Jameson2018-12-05
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Fix iOS Safari from making videos play fullscreen by default added PR comments resolved the lint used the deleted data param as condition in status template Switch to "timeline" when pressing user-settings Added user setting tooltip made links in user bio always open in new tabs addressed PR comments added tooltip Add userId property to timelines so that we don't overwrite user timeline meant for another user Added option to auto-hide subject field when it's empty. removes hacks from notifications storage, adds api call to let server update is_seen attribute fixes vimium not giving retweet button a hint Do not use underscore at the beginning of the method Logout user on password change Route user to the correct profile URL Typo Fix filetype detection Switch to settings when touching settings Switch to timeline on nav panel actions
| | * | | fixHenry Jameson2018-12-02
| | | | |
| | * | | fixHenry Jameson2018-12-02
| | | | |
| | * | | fallback for some weird case on my phoneHenry Jameson2018-12-02
| | | | |
| | * | | todoHenry Jameson2018-12-02
| | | | |
| | * | | missing stringHenry Jameson2018-12-02
| | | | |
| | * | | some more themes, fixesHenry Jameson2018-12-02
| | | | |
| | * | | localization strings, fixesHenry Jameson2018-12-02
| | | | |
| | * | | making inset shadows work on avatars againHenry Jameson2018-12-02
| | | | |
| | * | | fix retweeter avatar not getting proper shadowHenry Jameson2018-12-01
| | | | |
| | * | | avatars shadows, also allows drop-shadow useHenry Jameson2018-11-30
| | | | |
| | * | | updated preview windowHenry Jameson2018-11-27
| | | | |
| | * | | lint fixHenry Jameson2018-11-27
| | | | |
| | * | | fixed keep checkboxes working when exportingHenry Jameson2018-11-26
| | | | |
| | * | | unbreak user profilesHenry Jameson2018-11-26
| | | | |
| | * | | fix preview input text using wrong stringHenry Jameson2018-11-26
| | | | |
| | * | | fix panel link color, fix broken user profilesHenry Jameson2018-11-26
| | | | |
| | * | | Merge remote-tracking branch 'upstream/develop' into feature/theming2Henry Jameson2018-11-26
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (60 commits) whoops whoops 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 remove deploy stage remove deploy stage updated and completed German translation On logout switch to public timeline. minor modification of Chinese translation update Chinese translation Add Chinese language Fix posting. Put oauth text into description. Display OAuth login on login form button. ...