aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* default webPush to false, because having it at true leads to some problems withHenry Jameson2018-12-20
* Merge branch 'remove_favorite_hacks' into 'develop'HJ2018-12-19
|\
| * no more "broken favorite"Henry Jameson2018-12-19
* | Merge branch 'fix_defaults' into 'develop'Shpuld Shpludson2018-12-19
|\ \ | |/ |/|
| * Fixed some settings not using defaults from instance config. Made some parts ofHenry Jameson2018-12-18
* | Merge remote-tracking branch 'upstream/develop' into user-profile-overhaultHenry Jameson2018-12-18
|\|
| * Feature/bigger icons for mobile / #211Shpuld Shpludson2018-12-18
| * Merge branch 'feature/new-user-routes' into 'develop'lambda2018-12-18
| |\
| | * Fix oauth urlMaxim Filippov2018-12-17
| | * Redirect to /main/allMaxim Filippov2018-12-17
| | * Move userProfile link to methodsMaxim Filippov2018-12-17
| | * Merge branch 'develop' into feature/new-user-routesMaxim Filippov2018-12-17
| | |\
| | * | Add temporary redirectsMaxim Filippov2018-12-17
| | * | Implement user_profile.spec.jsMaxim Filippov2018-12-15
| | * | Use babel polyfill in karmaMaxim Filippov2018-12-13
| | * | Use 'userProfileLink' to generate user-profile linkMaxim Filippov2018-12-13
| | * | Use "-1" in indexOfMaxim Filippov2018-12-13
| | * | Add generateProfileLinkMaxim Filippov2018-12-13
| | * | Use "~" as a route namespace symbolMaxim Filippov2018-12-10
| | * | Pass userName instead of userIdMaxim Filippov2018-12-06
| | * | Fix redirect pathsMaxim Filippov2018-12-06
| | * | Fix typoMaxim Filippov2018-12-06
| | * | Fix avatar stylesMaxim Filippov2018-12-06
| | * | Move old routes to /p, use /nickname for user profilesMaxim Filippov2018-12-06
| | * | Move routes to the separate file -> make it testableMaxim Filippov2018-12-06
| * | | Make user profile page cleanerHenry Jameson2018-12-17
* | | | clean up the unused stuffHenry Jameson2018-12-17
* | | | missing string and unification with counters (order)Henry Jameson2018-12-17
* | | | collateral fix for tab displayHenry Jameson2018-12-17
* | | | 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |