Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2451 commits 59 branches 16 tags 15 MiB
Commit graph

2451 commits

This branch
This branch
All branches
Author SHA1 Message Date
raeno
c5042c07ef Prevent html-minifier to remove placeholder comment in index.html template 2018-12-13 23:35:27 +01:00
raeno
107596339c Add placeholder to insert server generated metatags. Related to #430 2018-12-13 22:29:07 +01: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
HJ
dcca4617d5 Merge branch 'dev_vald_fe/its_you' into 'develop' 
added condition to check for login user in user search

Closes #182

See merge request pleroma/pleroma-fe!417
 2018-12-13 19:56:22 +00:00
ValD
e2f825266a added condition to check for logined user 2018-12-13 23:20:59 +05:30
Shpuld Shpludson
ad56c8e5bd Merge branch 'collateral-damage-control' into 'develop' 
Collateral damage control

See merge request pleroma/pleroma-fe!418
 2018-12-13 17:47:01 +00:00
Henry Jameson
cc259411a7 fix gradients and minor artifacts 2018-12-13 20:41:23 +03:00
Henry Jameson
e1b523016b keep track of new instance options 2018-12-13 20:41:01 +03:00
Maxim Filippov
1341a7bb9c Use babel polyfill in karma 2018-12-13 20:27:03 +03:00
Henry Jameson
f87001c22f fix old MR 2018-12-13 20:25:46 +03:00
Maxim Filippov
e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
Maxim Filippov
70c48a076d Rollback disableDotRule 2018-12-13 19:53:14 +03:00
Shpuld Shpludson
ac60550e07 Merge branch 'mobile-back' into 'develop' 
Back button for mobile

Closes #197

See merge request pleroma/pleroma-fe!403
 2018-12-13 15:12:27 +00:00
Shpuld Shpludson
915487072b Merge branch 'fix/reset-follows-export' into 'develop' 
Reset enableFollowsExport when an export file is available to download

See merge request pleroma/pleroma-fe!412
 2018-12-13 15:06:50 +00:00
Shpuld Shpludson
aa7cff92aa Merge branch 'feature/configurable-nsfw-censor-image' into 'develop' 
make nsfw censor image configurable

See merge request pleroma/pleroma-fe!243
 2018-12-13 15:04:55 +00:00
Rinpatch
dd6a9ae645 oof 2018-12-13 17:51:29 +03:00
Shpuld Shpludson
25a88da17a Merge branch 'fix_loading_flicker' into 'develop' 
Throttle fetching old statuses to prevent spam, especially during scroll

Closes #176

See merge request pleroma/pleroma-fe!393
 2018-12-13 14:51:27 +00:00
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
rinpatch
457132fb37 get rid of slots 2018-12-13 15:44:37 +01:00
Shpuld Shpludson
dbe79a3c26 Merge branch 'dev-qol' into 'develop' 
Several fixes to make life of contributors a tiny bit easier.

See merge request pleroma/pleroma-fe!409
 2018-12-13 14:42:58 +00:00
Shpuld Shpludson
c824d25378 Merge branch 'fix_empty_profiles' into 'develop' 
Improved user profile display

Closes #82

See merge request pleroma/pleroma-fe!414
 2018-12-13 14:41:57 +00: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
HJ
f1c21be77c Merge branch 'fix-timeago' into 'develop' 
fix timeago font

See merge request pleroma/pleroma-fe!416
 2018-12-13 14:25:29 +00:00
Rinpatch
6de4dcc7c9 Resolve merge conflict 2018-12-13 17:22:19 +03:00
Henry Jameson
ff36d34186 fix timeago font 2018-12-13 17:20:31 +03:00
Henry Jameson
fa7c3c2097 Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles 
* upstream/develop: (121 commits)
  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
  fixed wrong height for selects
  better layouting for import-export, error display fixes
  added keep-colors option
  ...
 2018-12-13 17:11:22 +03:00
HJ
8e4777ccc6 Merge branch 'feature/push-subscriptions' into 'develop' 
add service worker and push notifications

See merge request pleroma/pleroma-fe!404
 2018-12-13 13:46:57 +00: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
Henry Jameson
42bb348219 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.
 2018-12-13 15:34:51 +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
b3455649c5 improve notification subscription 2018-12-13 18:04:09 +07:00
Maxim Filippov
7ffb7e6795 Use "-1" in indexOf 2018-12-13 13:51:47 +03:00
HJ
e443716bcd Merge branch 'fix-scope-copy' into 'develop' 
Fix typo that prevented scope copy from working.

Closes #214

See merge request pleroma/pleroma-fe!413
 2018-12-13 10:39:50 +00:00
Henry Jameson
9f48055261 Fix typo that prevented scope copy from working. 2018-12-13 13:34:47 +03:00
Rinpatch
48edc0c8fc Refactor arrays to individual options 2018-12-13 11:25:03 +03:00
Maxim Filippov
24caa2cfcd Add generateProfileLink 2018-12-13 05:00:01 +03:00
link0ff
33c2d21bb7 Reset enableFollowsExport to true after 2 sec when an export file is available to download 2018-12-12 22:00:04 +02:00
HJ
2077927ff3 Merge branch 'dev_vald_fe/user_name_panel' into 'develop' 
activate panel on user screen click

See merge request pleroma/pleroma-fe!408
 2018-12-12 19:31:15 +00:00
ValD
ce6d75331b added check for activatePanel is function or not 2018-12-13 00:56:04 +05:30
HJ
7325ff2e7a Merge branch 'dev_vald_fe/nsfw_preload' into 'develop' 
preload nsfw image

Closes #193

See merge request pleroma/pleroma-fe!411
 2018-12-12 19:01:53 +00:00
HJ
f0fb6e6015 Merge branch 'dev_vald_fe/timeago_panel' into 'develop' 
added activatePanel onclick for timeago button

See merge request pleroma/pleroma-fe!407
 2018-12-12 18:47:56 +00:00
HJ
13ef05d5e6 Merge branch 'dev_vald_fe/user_panel_counts' into 'develop' 
removed user_panel counts

See merge request pleroma/pleroma-fe!410
 2018-12-12 18:47:09 +00:00
ValD
481c5ecba8 addressed PR comments 2018-12-13 00:14:47 +05:30
ValD
e3848f6efb activate panel on user screen click 2018-12-13 00:13:47 +05:30
ValD
b271957b4c added not preload check so hidden toggles asap 2018-12-13 00:11:01 +05:30
ValD
33b962b13e removed counters from left panel 2018-12-12 23:56:12 +05:30
ValD
7556efa04f added router-links to all relavent links 2018-12-12 23:34:22 +05:30
ValD
1623dcb417 added activatePanel onclick for timeago button 2018-12-12 23:34:22 +05:30
ValD
7c6c2cfb22 added PR comments 2018-12-12 23:29:13 +05:30