aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add some more routes to side drawershpuld2018-12-22
|
* works but hackyshpuld2018-12-20
|\
| * Merge branch 'user-profile-overhault' into 'develop'HJ2018-12-18
| |\ | | | | | | | | | | | | | | | | | | Small refactor for followers/friends, change display to use tabs instead of "leaky brains" Closes #111 See merge request pleroma/pleroma-fe!427
| | * Merge remote-tracking branch 'upstream/develop' into user-profile-overhaultHenry Jameson2018-12-18
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (24 commits) Feature/bigger icons for mobile / #211 Fix oauth url Make user profile page cleaner Redirect to /main/all Move userProfile link to methods Fix user profile test Add temporary redirects Add local profile test Implement user_profile.spec.js Use babel polyfill in karma Use 'userProfileLink' to generate user-profile link Rollback disableDotRule Use "-1" in indexOf Add generateProfileLink Use "~" as a route namespace symbol Disable dot rule Pass userName instead of userId Typo in tests Fix redirect paths Fix typo ...
| * | Merge branch 'feature/bigger-icons-for-mobile' into 'develop'Shpuld Shpludson2018-12-18
| |\ \ | | | | | | | | | | | | | | | | Feature/bigger icons for mobile / #211 See merge request pleroma/pleroma-fe!423
| | * | Feature/bigger icons for mobile / #211Shpuld Shpludson2018-12-18
| |/ /
| | * 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
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| | * | 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 'develop' into feature/replace-panel-switchershpuld2018-12-18
|\| | |
| * | | Merge branch 'feature/new-user-routes' into 'develop'lambda2018-12-18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make domain.com/username routes work Closes pleroma#395 See merge request pleroma/pleroma-fe!392
| | * | | Fix oauth urlMaxim Filippov2018-12-17
| | | | |
| | * | | Redirect to /main/allMaxim Filippov2018-12-17
| | | | |
| | * | | Move userProfile link to methodsMaxim Filippov2018-12-17
| | | | |
| | * | | Fix user profile testMaxim Filippov2018-12-17
| | | | |
| | * | | Merge branch 'develop' into feature/new-user-routesMaxim Filippov2018-12-17
| | |\ \ \
| | * | | | Add temporary redirectsMaxim Filippov2018-12-17
| | | | | |
| | * | | | Add local profile testMaxim 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
| | | | | |
| | * | | | Rollback disableDotRuleMaxim Filippov2018-12-13
| | | | | |
| | * | | | Use "-1" in indexOfMaxim Filippov2018-12-13
| | | | | |
| | * | | | Add generateProfileLinkMaxim Filippov2018-12-13
| | | | | |
| | * | | | Use "~" as a route namespace symbolMaxim Filippov2018-12-10
| | | | | |
| | * | | | Disable dot ruleMaxim Filippov2018-12-06
| | | | | |
| | * | | | Pass userName instead of userIdMaxim Filippov2018-12-06
| | | | | |
| | * | | | Typo in testsMaxim 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
| | | | | |
| | * | | | Remove dummy componentMaxim Filippov2018-12-06
| | | | | |
| | * | | | Move routes to the separate file -> make it testableMaxim Filippov2018-12-06
| | | | | |
| * | | | | Merge branch 'clean-profile' into 'develop'lambda2018-12-17
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make user profile page cleaner Closes #225 See merge request pleroma/pleroma-fe!428
| | * | | | Make user profile page cleanerHenry Jameson2018-12-17
| |/ / / /
| * | | | 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
| | | | |
| * | | | Merge branch 'fix-tab-scroll' into 'develop'Shpuld Shpludson2018-12-16
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Fix tab scroll See merge request pleroma/pleroma-fe!426
| | * | | 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
| |/ / /
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-04 12:59:24 +0000