Commit Graph

3355 Commits

Author SHA1 Message Date
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
24ece95419 Web: Fix invalid plugins check on login 2022-08-29 11:29:08 +03:00
a9b8a64e61 Web: Added translation for rooms module. 2022-08-26 18:59:28 +03:00
ed5f62a877 Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
2022-08-26 18:48:20 +03:00
51e814a52c
Merge branch 'develop' into feature/system-plugin-v2 2022-08-26 18:18:39 +03:00
899d103639 Web: Restored work of auto-changelog and debug-info with local packages/auto-changelog-2.3.1.tgz 2022-08-26 17:59:52 +03:00
45f83c070c Web: Fixed tree. 2022-08-26 17:59:51 +03:00
8e24f343a7 Web: Renamed files. 2022-08-26 17:58:34 +03:00
2bfa12f8b6 Web: Changed translations, deleted useless translations. 2022-08-26 17:54:50 +03:00
b67e479ed0 Web: Deleted useless button. 2022-08-26 17:39:38 +03:00
303de70cad Web: Added parameters to the local storage. 2022-08-26 17:35:29 +03:00
07a8adc8e8 Web: Added a personal room to folder list. Disabled the selection of a shared room to save a backup. 2022-08-26 15:27:42 +03:00
TimofeyBoyko
3803163ff3 Merge branch 'develop' into feature/system-plugin-v2 2022-08-26 13:26:41 +03:00
3a3a3bbc76 Web: Fixed styles. 2022-08-26 11:35:57 +03:00
ac47004401 Web: Fixed translations. 2022-08-26 10:25:56 +03:00
8998c9ee5b Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-08-26 10:21:08 +03:00
084cea375a Web: Fixed translation for module documents. 2022-08-26 10:18:54 +03:00
eb3ed80b70 Web: Fixed folder tree (removed basic tree), refactoring. 2022-08-26 09:50:56 +03:00
20e8d3ebd7 Web: Added FloatingButton. 2022-08-26 08:51:18 +03:00
63ba97d982 Web: Fixed styles. 2022-08-26 08:14:44 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
TimofeyBoyko
1a321982b2 Web:Client:Plugins: change path to plugins 2022-08-25 14:51:19 +03:00
TimofeyBoyko
9966c783e0 Web:Client:PortalPlugins: add toastr with error for upload 2022-08-25 14:02:16 +03:00
TimofeyBoyko
3c331ca63e Web:Client:PortalPlugins: add empty screen 2022-08-25 13:36:26 +03:00
TimofeyBoyko
2b51fe3857 Web:Client:PortalPlugins: add check for empty response for upload 2022-08-25 11:56:13 +03:00
TimofeyBoyko
bc0ac515d8 Web:Pages:PortalPlugins: change upload for only js file 2022-08-25 11:07:39 +03:00
TimofeyBoyko
674073825e Web:Common:Api: add 'request' func to plugins api 2022-08-24 19:53:33 +03:00
61ff3cfd15 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-08-24 18:00:33 +03:00
e7f3976dbb Web: Fixed login page. 2022-08-24 17:59:50 +03:00
Artem Tarasov
2b915db425 Web: Doceditor: applied nconf, logPath is now taken from appsettings.services.json 2022-08-24 16:30:37 +03:00
Artem Tarasov
ee757db2a8 Web: Doceditor: added nconf 2022-08-24 16:28:10 +03:00
9e77e17260 Web: Transferred the calculation of the total price to the store. 2022-08-24 15:29:51 +03:00
4f666dfe25 Web: Added portal unavailable page. 2022-08-24 14:59:21 +03:00
Artem Tarasov
b8efdefbcd Web: Doceditor: fixed variable name for getting path to logs from environment 2022-08-24 13:35:57 +03:00
a72007023d Web: API request moved from child component. 2022-08-24 13:01:29 +03:00
TimofeyBoyko
c6ed9a433e Web:Client:ContextOptionsStore: fix plugin options 2022-08-24 12:57:36 +03:00
TimofeyBoyko
6ac0fe0546 Web:Delete useless code 2022-08-24 12:57:11 +03:00
TimofeyBoyko
4a29d2fab2 Web:Client: add feature for disabling plugin-system from server 2022-08-24 12:34:53 +03:00
TimofeyBoyko
2a2cf185e5 Web:Common:SettingsStore: add enablePlugins and pluginOptions 2022-08-24 12:33:37 +03:00
TimofeyBoyko
ee591c9bbb Web:Client:Helpers: update import for plugins helpers 2022-08-24 12:32:55 +03:00
TimofeyBoyko
051c9e207a Web:Common:API: move api for plugins from client to common 2022-08-24 12:32:26 +03:00
256785bc70 Web: Removed api request. 2022-08-24 11:33:40 +03:00
d951ad37a5 Web: Added color. 2022-08-24 10:35:46 +03:00
6c331a3074 Web: Added functionality for the grace period. 2022-08-24 10:25:08 +03:00
TimofeyBoyko
7042dca053 Merge branch 'develop' into feature/system-plugin-v2 2022-08-23 14:38:45 +03:00
TimofeyBoyko
5dc51e2c32 Web:Client:PortalPlugins: add translation keys 2022-08-23 14:35:51 +03:00
TimofeyBoyko
0ae23204f7 Web:Client:PortalPlugins: add delete method 2022-08-23 14:11:23 +03:00
737359b21a Merge branch 'develop' into feature/stripe 2022-08-23 12:05:06 +03:00
461e272393 Web: Disabling the functionality of selecting the number of managers when updating the tariff. 2022-08-23 11:53:38 +03:00
e041e04a8a Web: Fixed due date. 2022-08-23 11:52:36 +03:00