aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Restore old routes, enable user route as fallback.Lambda2018-12-25
|
* Merge branch 'push_fix' into 'develop'HJ2018-12-25
|\ | | | | | | | | | | | | Fixes for push notifications Closes #235 See merge request pleroma/pleroma-fe!433
| * fixHenry Jameson2018-12-25
| |
| * Merge remote-tracking branch 'upstream/develop' into push_fixHenry Jameson2018-12-25
| |\ | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Add a translation to the captcha strings in the registration form Small UI improvements for the CAPTCHA field Add encrypted captcha_answer_data for stateless captcha fixes many problems related to user profile
| * | small refactor, added push unsub notice for BEHenry Jameson2018-12-25
| | |
| * | simplified some code, made it possible to unregister serviceworker altogetherHenry Jameson2018-12-20
| | |
| * | default webPush to false, because having it at true leads to some problems withHenry Jameson2018-12-20
| | | | | | | | | | | | local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
* | | Update japanese translationHakaba Hitoyo2018-12-25
| | |
* | | Merge branch 'refactor-recommendations' into 'develop'HJ2018-12-25
|\ \ \ | | | | | | | | | | | | | | | | remove unneeded numbered variables who_to_follow See merge request pleroma/pleroma-fe!436
| * | | fix inconsistencies within who_to_follow_panelHannah Ward2018-12-25
| | | |
| * | | remove unneeded numbered variables who_to_followHannah Ward2018-12-25
| | |/ | |/|
* | | Merge branch 'fix_textfields' into 'develop'HJ2018-12-25
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix textarea not resizing correctly and probably cursor position Closes #230 See merge request pleroma/pleroma-fe!430
| * | fix for non-shrinking main post formHenry Jameson2018-12-25
| | |
| * | fixed incorrect height when empty textHenry Jameson2018-12-20
| | |
| * | I suppose SOME browsers don't do this by default...Henry Jameson2018-12-20
| | |
| * | Fix resize not working properly for textareasHenry Jameson2018-12-20
| | |
* | | 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
| | |
* | | 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
* | 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 ...
| * Feature/bigger icons for mobile / #211Shpuld Shpludson2018-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
| | |
| | * 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| * | | Merge branch 'captcha' into 'develop'Shpuld Shpludson2018-12-17
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Captcha See merge request pleroma/pleroma-fe!424