aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* New routes, notifications, other impovements in side drwaershpuld2018-12-28
|
* Add closed-check for touchmoveshpuld2018-12-23
|
* move closing logic to drawer, add swipe to closeshpuld2018-12-23
|
* Merge branch 'develop' into feature/replace-panel-switchershpuld2018-12-22
|\
| * Merge branch 'captcha' into 'develop'Shpuld Shpludson2018-12-22
| |\ | | | | | | | | | | | | Make captcha stateless See merge request pleroma/pleroma-fe!434
| | * Add a translation to the captcha strings in the registration formEkaterina Vaartis2018-12-21
| | |
| | * Small UI improvements for the CAPTCHA fieldEkaterina Vaartis2018-12-21
| | |
| | * Add encrypted captcha_answer_data for stateless captchaEkaterina Vaartis2018-12-21
| |/
| * Merge branch 'fix_followers' into 'develop'Shpuld Shpludson2018-12-20
| |\ | | | | | | | | | | | | | | | | | | fixes many problems related to user profile Closes #239 See merge request pleroma/pleroma-fe!432
| | * fixes many problems related to user profileHenry Jameson2018-12-20
| |/
| * Merge branch 'remove_favorite_hacks' into 'develop'HJ2018-12-19
| |\ | | | | | | | | | | | | | | | | | | no more "broken favorite" Closes #218 and #145 See merge request pleroma/pleroma-fe!431
| | * 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. Closes #228 See merge request pleroma/pleroma-fe!429
| | * Fixed some settings not using defaults from instance config. Made some parts ofHenry Jameson2018-12-18
| | | | | | | | | | | | code more readable
* | | 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
| | | | | |