aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* 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
* 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
| | * | 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
| | | |
| * | | 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
| | | |
* | | | 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 '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