aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* 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 ...
| * 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
| | | | | |
| * | | | | Merge branch 'fix/reset-follows-export' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset enableFollowsExport when an export file is available to download See merge request pleroma/pleroma-fe!412
| | * | | | | Reset enableFollowsExport to true after 2 sec when an export file is ↵link0ff2018-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | available to download
| * | | | | | Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make nsfw censor image configurable See merge request pleroma/pleroma-fe!243
| | * | | | | | make nsfw censor image configurableWilliam Pitcock2018-04-22
| | | | | | | |
| * | | | | | | Merge branch 'fix_loading_flicker' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttle fetching old statuses to prevent spam, especially during scroll Closes #176 See merge request pleroma/pleroma-fe!393
| | * | | | | | throttle fetching old statuses to prevent spam, especially during scrollHenry Jameson2018-12-04
| | | | | | | |
| * | | | | | | Merge branch 'dev-qol' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several fixes to make life of contributors a tiny bit easier. See merge request pleroma/pleroma-fe!409
| | * | | | | | | fixHenry Jameson2018-12-11
| | | | | | | | |
| | * | | | | | | Quality of Frontend Developer's Life: here to stayHenry Jameson2018-12-11
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'fix_empty_profiles' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved user profile display Closes #82 See merge request pleroma/pleroma-fe!414
| | * \ \ \ \ \ \ 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 ...
| | * | | | | | | Fix fetching new users, add storing local users in usersObjects with theirHenry Jameson2018-12-13
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen_name as well as id, so that they could be fetched zero-state with screen-name link.
| * | | | | | | Merge branch 'hide_network' into 'develop'Shpuld Shpludson2018-12-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FE part of pleroma!490 See merge request pleroma/pleroma-fe!415
| | * | | | | | | added hide_network option, fixed properties namingHenry Jameson2018-12-13
| | | | | | | | |
| * | | | | | | | fix timeago fontHenry Jameson2018-12-13
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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
| * | | | | | | improve notification subscriptionEgor Kislitsyn2018-12-13
| | | | | | | |
| * | | | | | | add checkbox to disable web pushEgor Kislitsyn2018-12-13
| | | | | | | |
| * | | | | | | fix race conditionEgor Kislitsyn2018-12-10
| | | | | | | |
| * | | | | | | improve push notifications codeEgor Kislitsyn2018-12-09
| | | | | | | |
| * | | | | | | second attempt to add subscribe module and fix race conditionEgor Kislitsyn2018-12-07
| | | | | | | |
| * | | | | | | Revert "add subscribe module and fix race condition"Egor Kislitsyn2018-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07f1b8523eddd596d154e68561a389d6b9742d95.
| * | | | | | | add subscribe module and fix race conditionEgor Kislitsyn2018-12-07
| | | | | | | |
| * | | | | | | fix typoEgor Kislitsyn2018-12-07
| | | | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-26 08:38:24 +0000