Commit graph

83 commits

Author SHA1 Message Date
shpuld
c7cffbb6c7 Merge branch 'develop' into feat/media-modal 2019-01-30 20:49:24 +02:00
lambda
1717e70046 Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
fix #292 dont show "load more" when bottomed out

Closes #292

See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
Maxim Filippov
298cea8f6d Split hide_network into hide_followers & hide_followings 2019-01-30 01:11:40 +03:00
shpuld
62e9525724 Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses 2019-01-29 21:04:52 +02:00
shpuld
51024a2c8a Merge branch 'develop' into feat/media-modal 2019-01-28 19:02:46 +02:00
shpuld
0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
shpuld
3978aaef84 Redo everything in the MR 2019-01-26 17:45:03 +02:00
William Pitcock
7b296696a3 user profile: add media timeline 2019-01-26 13:49:24 +00:00
HJ
3a3cf1d48a Merge branch 'favorites' into 'develop'
Add Favorites TL to user profile, add some initial support for MastoAPI

Closes #265 and #262

See merge request pleroma/pleroma-fe!462
2019-01-22 17:46:08 +00:00
Henry Jameson
a680f7d684 localization strings 2019-01-17 22:49:33 +03:00
Hakaba Hitoyo
05ead45fb7 Show who to follow in the mobile view 2019-01-16 02:33:08 +00:00
Hakaba Hitoyo
a60fc390a0 Add instance information page for mobile 2019-01-07 17:26:47 +00:00
shpuld
f72b1d048e Merge branch 'develop' into feature/replace-panel-switcher 2018-12-22 17:32:35 +02:00
shpuld
4836c8ac74 Add some more routes to side drawer 2018-12-22 17:32:07 +02:00
Ekaterina Vaartis
10642df528 Add a translation to the captcha strings in the registration form 2018-12-21 15:12:46 +03:00
Henry Jameson
d7973b0b80 Merge remote-tracking branch 'upstream/develop' into async_follow
* 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
  ...
2018-12-14 17:17:58 +03:00
HJ
99b2b7a203 Merge branch 'feature/file-size-checking' into 'develop'
[pleroma#36] Add errors when file uploading fails

See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
ValD
e2f825266a added condition to check for logined user 2018-12-13 23:20:59 +05:30
Henry Jameson
610724ffcd Merge remote-tracking branch 'upstream/develop' into mobile-back
* 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
  ...
2018-12-13 17:50:36 +03:00
Shpuld Shpludson
ad905576fc Merge branch 'hide_network' into 'develop'
FE part of pleroma!490

See merge request pleroma/pleroma-fe!415
2018-12-13 14:40:49 +00:00
Rinpatch
6de4dcc7c9 Resolve merge conflict 2018-12-13 17:22:19 +03:00
Henry Jameson
9dfff10717 Merge remote-tracking branch 'upstream/develop' into async_follow
* 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
  ...
2018-12-13 16:15:47 +03:00
Henry Jameson
c52b8019ae added hide_network option, fixed properties naming 2018-12-13 16:04:22 +03:00
Egor Kislitsyn
a8521fc8d9 Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
# Conflicts:
#	src/i18n/en.json
#	src/modules/interface.js
#	src/modules/users.js
#	yarn.lock
2018-12-13 18:22:15 +07:00
Egor Kislitsyn
02c0e15781 add checkbox to disable web push 2018-12-13 00:03:50 +07:00
Rinpatch
bf8bb9ce13 Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n 2018-12-12 16:38:01 +03:00
ValD
139659d42c renamed config to preload images and add ident to config 2018-12-12 03:42:29 +05:30
ValD
7b4e08dd93 added config for preload and made attachment responsive to it 2018-12-12 03:33:53 +05:30
Henry Jameson
c189a08dff added keep-colors option 2018-12-11 16:36:06 +03:00
Henry Jameson
3452864260 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop:
  Fix color fallback order
  Use console.warn instead of console.log
  Get rid of mutation_types file, use inline approach. Minor fixes
  Add fallback color rule.
  Change english validation error messages
  Clean up the code
  Validate name presence on client-side as well
  Better styling for client-side validation. Add I18n for validation errors.
  Fix broken ToS link. Fix linter errors
  Add client validation for registration form
  Use Array.reduce instead of lodash.reduce
  Humanize validation errors returned on registration
  Added user option to hide instance-specific panel, rearranged config screen to better categorize it / adjustments to language selector
  fix
2018-12-11 01:01:16 +03:00
Rinpatch
6a00854189 Count in binary bytes and remove i18 from file size format service 2018-12-10 17:06:32 +03:00
Rinpatch
88145c5934 Add a space between filesizes 2018-12-10 10:04:42 +03:00
Rinpatch
c69a8dc197 Add file size formating 2018-12-10 09:50:04 +03:00
rinpatch
f69331e49d Improve error messages 2018-12-08 22:36:54 +01:00
Rinpatch
ba188eddab [pleroma#36] Add upload errors 2018-12-08 18:23:21 +03:00
lambda
fb5261b926 Merge branch 'hideISP' into 'develop'
Add user configuration option to hide instance-specific panel

Closes #196

See merge request pleroma/pleroma-fe!402
2018-12-08 10:05:16 +00:00
raeno
c03cc3ae83 Change english validation error messages 2018-12-05 20:29:59 +04:00
raeno
91a72d51ff Validate name presence on client-side as well
* remove email address validation, we have it covered by html itself and it's quite annoying
* add shakeError animation
* fix styles a bit
2018-12-05 19:42:33 +04:00
raeno
f9ff839b1a Better styling for client-side validation. Add I18n for validation errors. 2018-12-05 19:17:29 +04:00
Henry Jameson
403c86e4d1 back button for mobile 2018-12-05 15:01:56 +03:00
Henry Jameson
6636c0f551 mobile fixes 2018-12-05 12:01:24 +03:00
Henry Jameson
47b0b385f4 Added user option to hide instance-specific panel, rearranged config screen to
better categorize it / adjustments to language selector
2018-12-05 11:37:01 +03:00
Henry Jameson
51cf4dc298 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop:
  Fix iOS Safari from making videos play fullscreen by default
  added PR comments
  resolved the lint
  used the deleted data param as condition in status template
  Switch to "timeline" when pressing user-settings
  Added user setting tooltip
  made links in user bio always open in new tabs
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
  Do not use underscore at the beginning of the method
  Logout user on password change
  Route user to the correct profile URL
  Typo
  Fix filetype detection
  Switch to settings when touching settings
  Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
ValD
ea4fafb27e Added user setting tooltip 2018-12-04 15:24:01 +05:30
Henry Jameson
ca19025187 Added support for async following including delayed confirmation if we followed
user or not
2018-12-04 12:50:29 +03:00
ValD
c142f7b7b6 addressed PR comments 2018-12-04 00:45:31 +05:30
ValD
c40bda7c2a added tooltip 2018-12-04 00:45:31 +05:30
Henry Jameson
b34097a5c1 Added option to auto-hide subject field when it's empty. 2018-12-03 06:47:35 +03:00
Henry Jameson
67ca21b2e6 localization strings, fixes 2018-12-02 09:38:40 +03:00
Henry Jameson
bee738c815 making inset shadows work on avatars again 2018-12-02 08:47:55 +03:00