aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fixed some settings not using defaults from instance config. Made some parts ofHenry Jameson2018-12-18
| | | | code more readable
* 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
|/
* 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
|/ / /
* | | Merge branch 'fix-name' into 'develop'HJ2018-12-15
|\ \ \ | |/ / |/| | | | | | | | Fix impossible to change name See merge request pleroma/pleroma-fe!425
| * | fixHenry Jameson2018-12-15
| | |
* | | Merge branch 'async_follow' into 'develop'Shpuld Shpludson2018-12-14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Better "follow" button behavior Closes #133 See merge request pleroma/pleroma-fe!396
| * | | slightly changed the code to have less mutations, added commentsHenry Jameson2018-12-14
| | | |
| * | | Merge remote-tracking branch 'upstream/develop' into async_followHenry Jameson2018-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 ...
| * \ \ \ Merge remote-tracking branch 'upstream/develop' into async_followHenry Jameson2018-12-13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (131 commits) Fix typo that prevented scope copy from working. added check for activatePanel is function or not addressed PR comments activate panel on user screen click added not preload check so hidden toggles asap removed counters from left panel added router-links to all relavent links added activatePanel onclick for timeago button added PR comments removed brackets from condition resolved lint issue renamed config to preload images and add ident to config added config for preload and made attachment responsive to it preload nsfw image fix fixed wrong height for selects better layouting for import-export, error display fixes added keep-colors option separated preview and exported from style_switcher revert that, it's actually used, i'm an idiot ...
| * | | | | Added support for async following including delayed confirmation if we followedHenry Jameson2018-12-04
| | | | | | | | | | | | | | | | | | | | | | | | user or not
* | | | | | Merge branch 'fix-hide-network' into 'develop'HJ2018-12-14
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | oof See merge request pleroma/pleroma-fe!422
| * | | | | oofHenry Jameson2018-12-14
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-preload-nsfw' into 'develop'HJ2018-12-14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix preload images option being always disabled See merge request pleroma/pleroma-fe!421