aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into user-profile-overhaultHenry Jameson2018-12-17
|\
| * Merge branch 'captcha' into 'develop'Shpuld Shpludson2018-12-17
| |\
| | * 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
|/ /
* | Merge branch 'fix-name' into 'develop'HJ2018-12-15
|\ \ | |/ |/|
| * fixHenry Jameson2018-12-15
* | Merge branch 'async_follow' into 'develop'Shpuld Shpludson2018-12-14
|\ \
| * | 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
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into async_followHenry Jameson2018-12-13
| |\ \ \
| * | | | Added support for async following including delayed confirmation if we followedHenry Jameson2018-12-04
* | | | | Merge branch 'fix-hide-network' into 'develop'HJ2018-12-14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | oofHenry Jameson2018-12-14
| | |_|/ | |/| |
* | | | Merge branch 'fix-preload-nsfw' into 'develop'HJ2018-12-14
|\ \ \ \
| * | | | more damage controlHenry Jameson2018-12-14
| |/ / /
* | | | Merge remote-tracking branch 'upstream/develop' into search-mobile-fixesHenry Jameson2018-12-14
|\| | |
| * | | fix chromeHenry Jameson2018-12-14
| * | | 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
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-14 07:02:31 +0000