aboutsummaryrefslogtreecommitdiff
path: root/src/i18n
Commit message (Collapse)AuthorAge
* Add german translation for option labeljasper2019-02-06
|
* Add option to hide filtered statusesjasper2019-02-06
|
* Merge branch 'feature/split-hide-network-fixed' into 'develop'Shpuld Shpludson2019-02-06
|\ | | | | | | | | Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma-fe!536
| * Rename "hide_following" to "hide_follows"Maxim Filippov2019-02-06
| |
| * Split hide_network into hide_followers & hide_followingsMaxim Filippov2019-02-06
| |
* | Update es.jsontarteka2019-02-05
|/
* merge develop and fix conflicts AGAINshpuld2019-02-04
|\
| * Revert "Merge branch 'feature/split-hide-network' into 'develop'"Shpuld Shpludson2019-02-03
| | | | | | This reverts merge request !497
* | Combine friends/followersshpuld2019-02-03
|/
* Merge branch '238-add-avatar-size-suggestion' into 'develop'Shpuld Shpludson2019-02-03
|\ | | | | | | | | | | | | Add avatar size instruction notice Closes #238 See merge request pleroma/pleroma-fe!512
| * Add avatar size instruction noticetaehoon2019-02-02
| |
* | Change video playing default without bothering making it an instance ↵shpuld2019-01-31
|/ | | | configurable
* Merge branch 'develop' into feat/media-modalshpuld2019-01-30
|\
| * Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'lambda2019-01-30
| |\ | | | | | | | | | | | | | | | | | | fix #292 dont show "load more" when bottomed out Closes #292 See merge request pleroma/pleroma-fe!496
| | * Add loading indicator for notifications, make timelines indicate bottoming ↵shpuld2019-01-29
| | | | | | | | | | | | out when no more statuses
| * | Split hide_network into hide_followers & hide_followingsMaxim Filippov2019-01-30
| |/
* | Merge branch 'develop' into feat/media-modalshpuld2019-01-28
|\|
| * Merge branch 'develop' into 'develop'Shpuld Shpludson2019-01-28
| |\ | | | | | | | | | | | | Add Dutch translation See merge request pleroma/pleroma-fe!482
| | * Add Dutch translationspctrl2019-01-27
| | |
| * | user profile: add media timelineWilliam Pitcock2019-01-26
| |/
* | Merge develop and fix conflictshpuld2019-01-26
|\|
| * Merge branch 'favorites' into 'develop'HJ2019-01-22
| |\ | | | | | | | | | | | | | | | | | | Add Favorites TL to user profile, add some initial support for MastoAPI Closes #265 and #262 See merge request pleroma/pleroma-fe!462
| | * localization stringsHenry Jameson2019-01-17
| | |
* | | Redo everything in the MRshpuld2019-01-26
|/ /
* | update japanese translationhakabahitoyo2019-01-16
| |
* | Show who to follow in the mobile viewHakaba Hitoyo2019-01-16
|/
* Add Korean translationkjwon152019-01-10
|
* Add instance information page for mobileHakaba Hitoyo2019-01-07
|
* updated German translationVinzenz Vietzke2019-01-03
| | | | | * added theme settings * added various missing single strings
* fix conflict in user card contentshpuld2018-12-28
|\
| * Update japanese translationHakaba Hitoyo2018-12-25
| |
* | Merge branch 'develop' into feature/replace-panel-switchershpuld2018-12-22
|\|
| * Add a translation to the captcha strings in the registration formEkaterina Vaartis2018-12-21
| |
* | Add some more routes to side drawershpuld2018-12-22
|/
* 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 branch 'feature/file-size-checking' into 'develop'HJ2018-12-13
| |\ | | | | | | | | | | | | [pleroma#36] Add errors when file uploading fails See merge request pleroma/pleroma-fe!405
| | * Resolve merge conflictRinpatch2018-12-13
| | |\
| | * | Moved upload errors in user_settings to an array. Moved upload error strings ↵Rinpatch2018-12-12
| | | | | | | | | | | | | | | | to its separate section in i18n
| | * | Count in binary bytes and remove i18 from file size format serviceRinpatch2018-12-10
| | | |
| | * | Add a space between filesizesRinpatch2018-12-10
| | | |
| | * | Add file size formatingRinpatch2018-12-10
| | | |
| | * | Improve error messagesrinpatch2018-12-08
| | | |
| | * | [pleroma#36] Add upload errorsRinpatch2018-12-08
| | | |
| * | | added condition to check for logined userValD2018-12-13
| | | |
| * | | Merge remote-tracking branch 'upstream/develop' into mobile-backHenry Jameson2018-12-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (142 commits) 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 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 add checkbox to disable web push 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 ...
| | * \ \ Merge branch 'hide_network' into 'develop'Shpuld Shpludson2018-12-13
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | FE part of pleroma!490 See merge request pleroma/pleroma-fe!415
| | | * | added hide_network option, fixed properties namingHenry Jameson2018-12-13
| | | | |
| | * | | Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into ↵Egor Kislitsyn2018-12-13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/push-subscriptions # Conflicts: # src/i18n/en.json # src/modules/interface.js # src/modules/users.js # yarn.lock
| | * | | add checkbox to disable web pushEgor Kislitsyn2018-12-13
| | | | |
| * | | | back button for mobileHenry Jameson2018-12-05
| |/ / /