| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | Merge branch 'feature/new-user-routes' into 'develop' | lambda | 2018-12-18 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make domain.com/username routes work Closes pleroma#395 See merge request pleroma/pleroma-fe!392 | ||
| | | * | | | Move userProfile link to methods | Maxim Filippov | 2018-12-17 |
| | | | | | | |||
| | | * | | | Merge branch 'develop' into feature/new-user-routes | Maxim Filippov | 2018-12-17 |
| | | |\ \ \ | |||
| | | * | | | | Implement user_profile.spec.js | Maxim Filippov | 2018-12-15 |
| | | | | | | | |||
| | | * | | | | Use 'userProfileLink' to generate user-profile link | Maxim Filippov | 2018-12-13 |
| | | | | | | | |||
| | | * | | | | Add generateProfileLink | Maxim Filippov | 2018-12-13 |
| | | | | | | | |||
| | | * | | | | Use "~" as a route namespace symbol | Maxim Filippov | 2018-12-10 |
| | | | | | | | |||
| | | * | | | | Pass userName instead of userId | Maxim Filippov | 2018-12-06 |
| | | | | | | | |||
| | | * | | | | Fix redirect paths | Maxim Filippov | 2018-12-06 |
| | | | | | | | |||
| | | * | | | | Fix typo | Maxim Filippov | 2018-12-06 |
| | | | | | | | |||
| | | * | | | | Fix avatar styles | Maxim Filippov | 2018-12-06 |
| | | | | | | | |||
| | | * | | | | Move old routes to /p, use /nickname for user profiles | Maxim Filippov | 2018-12-06 |
| | | | | | | | |||
| | * | | | | | Make user profile page cleaner | Henry Jameson | 2018-12-17 |
| | | |_|_|/ | |/| | | | |||
| | * | | | | Merge branch 'captcha' into 'develop' | Shpuld Shpludson | 2018-12-17 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Captcha See merge request pleroma/pleroma-fe!424 | ||
| | | * | | | Fix style | Ekaterina Vaartis | 2018-12-16 |
| | | | | | | |||
| | | * | | | Add a way to get new captcha on click | Ekaterina Vaartis | 2018-12-16 |
| | | | | | | |||
| | | * | | | Fix style | Ekaterina Vaartis | 2018-12-16 |
| | | | | | | |||
| | | * | | | Separate captcha into the backendInteractor | Ekaterina Vaartis | 2018-12-16 |
| | | | | | | |||
| | | * | | | Support disabling captcha | Ekaterina Vaartis | 2018-12-15 |
| | | | | | | |||
| | | * | | | Base support for CAPTCHA (kocaptcha) | Ekaterina Vaartis | 2018-12-15 |
| | | | | | | |||
| | * | | | | more visual fixes | Henry Jameson | 2018-12-16 |
| | | | | | | |||
| | * | | | | changed bottom-shadow hiding method to be more compatible with overflow | Henry Jameson | 2018-12-16 |
| | | | | | | |||
| | * | | | | small fix for overflowing tab-switcher | Henry Jameson | 2018-12-16 |
| | | |_|/ | |/| | | |||
| * / | | | Remove panel switcher, add rudimentary drawer | shpuld | 2018-12-15 |
| |/ / / | |||
| * | | | Merge branch 'fix-name' into 'develop' | HJ | 2018-12-15 |
| |\ \ \ | |/ / |/| | | | | | | | | Fix impossible to change name See merge request pleroma/pleroma-fe!425 | ||
| | * | | fix | Henry Jameson | 2018-12-15 |
| | | | | |||
| * | | | Merge branch 'async_follow' into 'develop' | Shpuld Shpludson | 2018-12-14 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Better "follow" button behavior Closes #133 See merge request pleroma/pleroma-fe!396 | ||
| | * | | | slightly changed the code to have less mutations, added comments | Henry Jameson | 2018-12-14 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'upstream/develop' into async_follow | Henry Jameson | 2018-12-14 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (45 commits) fix chrome Prevent html-minifier to remove placeholder comment in index.html template Add placeholder to insert server generated metatags. Related to #430 added condition to check for logined user fix gradients and minor artifacts keep track of new instance options fix old MR oof get rid of slots fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. improve notification subscription Refactor arrays to individual options Reset enableFollowsExport to true after 2 sec when an export file is available to download Write a unit test for fileSizeFormatService add checkbox to disable web push I am dumb Handle errors from server Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n ... | ||
