aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into user-profile-overhaultHenry Jameson2018-12-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Fix style Add a way to get new captcha on click Fix style Separate captcha into the backendInteractor more visual fixes changed bottom-shadow hiding method to be more compatible with overflow small fix for overflowing tab-switcher Support disabling captcha Base support for CAPTCHA (kocaptcha)
| * Merge branch 'captcha' into 'develop'Shpuld Shpludson2018-12-17
| |\ | | | | | | | | | | | | Captcha See merge request pleroma/pleroma-fe!424
| | * Fix styleEkaterina Vaartis2018-12-16
| | |
| | * Add a way to get new captcha on clickEkaterina Vaartis2018-12-16
| | |
| | * Fix styleEkaterina Vaartis2018-12-16
| | |
| | * Separate captcha into the backendInteractorEkaterina Vaartis2018-12-16
| | |
| | * Support disabling captchaEkaterina Vaartis2018-12-15
| | |
| | * Base support for CAPTCHA (kocaptcha)Ekaterina Vaartis2018-12-15
| | |
| * | more visual fixesHenry Jameson2018-12-16
| | |
| * | changed bottom-shadow hiding method to be more compatible with overflowHenry Jameson2018-12-16
| | |
| * | small fix for overflowing tab-switcherHenry Jameson2018-12-16
| | |
* | | collateral fixes for user-card: use still-image, styles for custom emojiHenry Jameson2018-12-17
| | |
* | | Refactor follower/friends out of statuses/timeline into user_profile where itHenry Jameson2018-12-17
|/ / | | | | | | belongs. Changed display of profile to single panel with tabs.
* | Merge branch 'fix-name' into 'develop'HJ2018-12-15
|\ \ | |/ |/| | | | | Fix impossible to change name See merge request pleroma/pleroma-fe!425
| * fixHenry Jameson2018-12-15
| |
* | Merge branch 'async_follow' into 'develop'Shpuld Shpludson2018-12-14
|\ \ | | | | | | | | | | | | | | | | | | Better "follow" button behavior Closes #133 See merge request pleroma/pleroma-fe!396
| * | slightly changed the code to have less mutations, added commentsHenry Jameson2018-12-14
| | |
| * | Merge remote-tracking branch 'upstream/develop' into async_followHenry Jameson2018-12-14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (45 commits) fix chrome Prevent html-minifier to remove placeholder comment in index.html template Add placeholder to insert server generated metatags. Related to #430 added condition to check for logined user fix gradients and minor artifacts keep track of new instance options fix old MR oof get rid of slots fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. improve notification subscription Refactor arrays to individual options Reset enableFollowsExport to true after 2 sec when an export file is available to download Write a unit test for fileSizeFormatService add checkbox to disable web push I am dumb Handle errors from server Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n ...
| * \ \ Merge remote-tracking branch 'upstream/develop' into async_followHenry Jameson2018-12-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (131 commits) 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 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 separated preview and exported from style_switcher revert that, it's actually used, i'm an idiot ...
| * | | | Added support for async following including delayed confirmation if we followedHenry Jameson2018-12-04
| | | | | | | | | | | | | | | | | | | | user or not
* | | | | Merge branch 'fix-hide-network' into 'develop'HJ2018-12-14
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | oof See merge request pleroma/pleroma-fe!422
| * | | | oofHenry Jameson2018-12-14
| | |_|/ | |/| |
* | | | Merge branch 'fix-preload-nsfw' into 'develop'HJ2018-12-14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix preload images option being always disabled See merge request pleroma/pleroma-fe!421
| * | | | more damage controlHenry Jameson2018-12-14
| |/ / /
* | | | Merge remote-tracking branch 'upstream/develop' into search-mobile-fixesHenry Jameson2018-12-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (176 commits) fix chrome Prevent html-minifier to remove placeholder comment in index.html template Add placeholder to insert server generated metatags. Related to #430 added condition to check for logined user fix gradients and minor artifacts keep track of new instance options fix old MR oof get rid of slots fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. improve notification subscription Fix typo that prevented scope copy from working. Refactor arrays to individual options Reset enableFollowsExport to true after 2 sec when an export file is available to download 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 ...
| * | | fix chromeHenry Jameson2018-12-14
| | | |
| * | | Merge branch 'feature/file-size-checking' into 'develop'HJ2018-12-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [pleroma#36] Add errors when file uploading fails See merge request pleroma/pleroma-fe!405
| | * | | oofRinpatch2018-12-13
| | | | |
| | * | | get rid of slotsrinpatch2018-12-13
| | | | |
| | * | | Resolve merge conflictRinpatch2018-12-13
| | |\ \ \
| | * | | | Refactor arrays to individual optionsRinpatch2018-12-13
| | | | | |
| | * | | | I am dumbRinpatch2018-12-12
| | | | | |
| | * | | | Handle errors from serverRinpatch2018-12-12
| | | | | |
| | * | | | Moved upload errors in user_settings to an array. Moved upload error strings ↵Rinpatch2018-12-12
| | | | | | | | | | | | | | | | | | | | | | | | to its separate section in i18n
| | * | | | Avatar, background, banner filesize errorsRinpatch2018-12-11
| | | | | |
| | * | | | Count in binary bytes and remove i18 from file size format serviceRinpatch2018-12-10
| | | | | |
| | * | | | Add a space between filesizesRinpatch2018-12-10
| | | | | |
| | * | | | LintRinpatch2018-12-10
| | | | | |
| | * | | | Add file size formatingRinpatch2018-12-10
| | | | | |
| | * | | | Fix formatingrinpatch2018-12-08
| | | | | |
| | * | | | Improve error messagesrinpatch2018-12-08
| | | | | |
| | * | | | Make uploadlimit an object that stores upload limits for avatars, banners, ↵rinpatch2018-12-08
| | | | | | | | | | | | | | | | | | | | | | | | backgrounds, general content
| | * | | | [pleroma#36] Add upload errorsRinpatch2018-12-08
| | | | | |
| * | | | | added condition to check for logined userValD2018-12-13
| | | | | |
| * | | | | fix gradients and minor artifactsHenry Jameson2018-12-13
| | | | | |
| * | | | | keep track of new instance optionsHenry Jameson2018-12-13
| | | | | |
| * | | | | fix old MRHenry Jameson2018-12-13
| | | | | |
| * | | | | Merge branch 'mobile-back' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back button for mobile Closes #197 See merge request pleroma/pleroma-fe!403
| | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into mobile-backHenry Jameson2018-12-13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (142 commits) fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. 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 ...
| | * | | | | | back button for mobileHenry Jameson2018-12-05
| | | | | | | |