| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | merge develop, fix conflicts, fix logged out bug | shpuld | 2018-12-29 |
| |\ | |||
| | * | Merge branch 'restore-routes' into 'develop' | lambda | 2018-12-29 |
| | |\ | | | | | | | | | | | | | Restore old routes, enable user route as fallback. See merge request pleroma/pleroma-fe!440 | ||
| | | * | Treat reserved users like external users in the frontend. | Lambda | 2018-12-26 |
| | | | | |||
| | | * | Restore old routes, enable user route as fallback. | Lambda | 2018-12-25 |
| | | | | |||
| * | | | Cleanup and remove divider element in side drawer | shpuld | 2018-12-29 |
| | | | | |||
| * | | | fix conflict in user card content | shpuld | 2018-12-28 |
| |\| | | |||
| | * | | Add "noAttachmentLinks" to src/modules/instance.js | Maxim Filippov | 2018-12-27 |
| | | | | |||
| | * | | Make "noAttachmentLinks" configurable | Maxim Filippov | 2018-12-27 |
| | | | | |||
| | * | | No attachment links | Maxim Filippov | 2018-12-27 |
| | | | | |||
| | * | | Merge branch 'improve_push' into 'develop' | HJ | 2018-12-26 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve web push notifications Closes #231 See merge request pleroma/pleroma-fe!438 | ||
| | | * | | improve web push notifications | Egor Kislitsyn | 2018-12-25 |
| | | |/ | |||
| | * / | User Card Content fixes and updates | HJ | 2018-12-26 |
| | |/ | |||
| | * | Merge branch 'push_fix' into 'develop' | HJ | 2018-12-25 |
| | |\ | | | | | | | | | | | | | | | | | | | Fixes for push notifications Closes #235 See merge request pleroma/pleroma-fe!433 | ||
| | | * | fix | Henry Jameson | 2018-12-25 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/develop' into push_fix | Henry Jameson | 2018-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 BE | Henry Jameson | 2018-12-25 |
| | | | | | |||
| | | * | | simplified some code, made it possible to unregister serviceworker altogether | Henry Jameson | 2018-12-20 |
| | | | | | |||
| | | * | | default webPush to false, because having it at true leads to some problems with | Henry Jameson | 2018-12-20 |
| | | | | | | | | | | | | | | | | | local dev mode. Instances can re-enable it, and BE can default it to true in config.exs | ||
| | * | | | Update japanese translation | Hakaba Hitoyo | 2018-12-25 |
| | | | | | |||
| | * | | | Merge branch 'refactor-recommendations' into 'develop' | HJ | 2018-12-25 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | remove unneeded numbered variables who_to_follow See merge request pleroma/pleroma-fe!436 | ||
| | | * | | | fix inconsistencies within who_to_follow_panel | Hannah Ward | 2018-12-25 |
| | | | | | | |||
| | | * | | | remove unneeded numbered variables who_to_follow | Hannah Ward | 2018-12-25 |
| | | | |/ | | |/| | |||
| | * | | | Merge branch 'fix_textfields' into 'develop' | HJ | 2018-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 form | Henry Jameson | 2018-12-25 |
| | | | | | |||
| | | * | | fixed incorrect height when empty text | Henry Jameson | 2018-12-20 |
| | | | | | |||
| | | * | | I suppose SOME browsers don't do this by default... | Henry Jameson | 2018-12-20 |
| | | | | | |||
| | | * | | Fix resize not working properly for textareas | Henry Jameson | 2018-12-20 |
| | | | | | |||
| * | | | | New routes, notifications, other impovements in side drwaer | shpuld | 2018-12-28 |
| | | | | | |||
| * | | | | Add closed-check for touchmove | shpuld | 2018-12-23 |
| | | | | | |||
| * | | | | move closing logic to drawer, add swipe to close | shpuld | 2018-12-23 |
| | | | | | |||
| * | | | | Merge branch 'develop' into feature/replace-panel-switcher | shpuld | 2018-12-22 |
| |\| | | | |||
| | * | | | Add a translation to the captcha strings in the registration form | Ekaterina Vaartis | 2018-12-21 |
| | | | | | |||
| | * | | | Small UI improvements for the CAPTCHA field | Ekaterina Vaartis | 2018-12-21 |
| | | | | | |||
| | * | | | Add encrypted captcha_answer_data for stateless captcha | Ekaterina Vaartis | 2018-12-21 |
| | | | | | |||
| | * | | | fixes many problems related to user profile | Henry Jameson | 2018-12-20 |
| | | |/ | |/| | |||
| | * | | Merge branch 'remove_favorite_hacks' into 'develop' | HJ | 2018-12-19 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | no more "broken favorite" Closes #218 and #145 See merge request pleroma/pleroma-fe!431 | ||
| | | * | | no more "broken favorite" | Henry Jameson | 2018-12-19 |
| | | | | | |||
| | * | | | Merge branch 'fix_defaults' into 'develop' | Shpuld Shpludson | 2018-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 of | Henry Jameson | 2018-12-18 |
| | | |/ | | | | | | | | | | code more readable | ||
| * | | | Add some more routes to side drawer | shpuld | 2018-12-22 |
| | | | | |||
| * | | | works but hacky | shpuld | 2018-12-20 |
| |\| | | |||
| | * | | Merge remote-tracking branch 'upstream/develop' into user-profile-overhault | Henry Jameson | 2018-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 / #211 | Shpuld Shpludson | 2018-12-18 |
| | | | | |||
| | * | | clean up the unused stuff | Henry Jameson | 2018-12-17 |
| | | | | |||
| | * | | missing string and unification with counters (order) | Henry Jameson | 2018-12-17 |
| | | | | |||
| | * | | collateral fix for tab display | Henry Jameson | 2018-12-17 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/develop' into user-profile-overhault | Henry Jameson | 2018-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 emoji | Henry Jameson | 2018-12-17 |
| | | | | | |||
| | * | | | Refactor follower/friends out of statuses/timeline into user_profile where it | Henry Jameson | 2018-12-17 |
| | | | | | | | | | | | | | | | | | belongs. Changed display of profile to single panel with tabs. | ||
| * | | | | Merge branch 'develop' into feature/replace-panel-switcher | shpuld | 2018-12-18 |
| |\ \ \ \ | | |_|/ | |/| | | |||
