aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'feature/file-size-checking' into 'develop'HJ2018-12-13
|\
| * 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
| * | 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, ba...rinpatch2018-12-08
| * | [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
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into mobile-backHenry Jameson2018-12-13
| |\ \ \
| * | | | back button for mobileHenry Jameson2018-12-05
* | | | | Merge branch 'fix/reset-follows-export' into 'develop'Shpuld Shpludson2018-12-13
|\ \ \ \ \
| * | | | | Reset enableFollowsExport to true after 2 sec when an export file is availabl...link0ff2018-12-12
* | | | | | Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'Shpuld Shpludson2018-12-13
|\ \ \ \ \ \
| * | | | | | 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 scrollHenry Jameson2018-12-04
* | | | | | | Merge branch 'dev-qol' into 'develop'Shpuld Shpludson2018-12-13
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into fix_empty_profilesHenry Jameson2018-12-13
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fix fetching new users, add storing local users in usersObjects with theirHenry Jameson2018-12-13
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'hide_network' into 'develop'Shpuld Shpludson2018-12-13
|\ \ \ \ \ \ \
| * | | | | | | added hide_network option, fixed properties namingHenry Jameson2018-12-13
* | | | | | | | fix timeago fontHenry Jameson2018-12-13
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-sub...Egor Kislitsyn2018-12-13
|\| | | | | |
| * | | | | | Merge branch 'fix-scope-copy' into 'develop'HJ2018-12-13
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | 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
| |\ \ \ \ \
| | * | | | | 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
| |\ \ \ \ \ \
| | * | | | | | added not preload check so hidden toggles asapValD2018-12-13
| | * | | | | | added PR commentsValD2018-12-12
| | * | | | | | removed brackets from conditionValD2018-12-12