Commit Graph

5670 Commits

Author SHA1 Message Date
SuhorukovAnton
4db1cd0af8 Merge branch 'master' into feature/socket.io 2020-08-14 14:01:27 +03:00
SuhorukovAnton
645b07b511 socket: bagfix 2020-08-14 13:56:15 +03:00
58fffc1756 File: fix revision 2020-08-14 11:35:34 +03:00
cbf9630d7f File: added Locked, LockedBy 2020-08-13 11:52:59 +03:00
6782269c7f Files: lock file 2020-08-12 18:13:52 +03:00
3a37e0839a Files: fix FileShareLink 2020-08-12 17:34:54 +03:00
acf5cff2f9
Merge pull request #67 from ONLYOFFICE/feature/Wizard
Feature/wizard
2020-08-12 17:33:18 +03:00
Artem Tarasov
1bd341fc33 fix translate 2020-08-12 17:17:14 +03:00
Artem Tarasov
c6d1198ae0 deleted console.log, simple condition 2020-08-12 16:38:34 +03:00
Artem Tarasov
4499d82de9 decomposition 2020-08-12 16:32:42 +03:00
Artem Tarasov
c301178a16 fixed translate 2020-08-12 16:32:17 +03:00
Artem Tarasov
171ae1b147 web: common: bump version 2020-08-12 14:57:41 +03:00
Artem Tarasov
00fcc549e5 web: components: bump version 2020-08-12 14:57:24 +03:00
Artem Tarasov
2bd6c8eb10 Merge branch 'master' into feature/Wizard 2020-08-12 14:56:22 +03:00
Artem Tarasov
f110b2a49a deleted Toast, added ModalDialog 2020-08-12 14:18:40 +03:00
Artem Tarasov
e3119d4610 fixed fontWeight link for License 2020-08-12 13:30:24 +03:00
Artem Tarasov
034d60707d fixed link 2020-08-12 13:08:24 +03:00
Artem Tarasov
a19d7ec4cf fixed modal dialog 2020-08-12 12:00:47 +03:00
Artem Tarasov
1503bc105b fix link 2020-08-12 11:54:08 +03:00
bcda6bf69f Api: refresh license 2020-08-11 11:52:39 +03:00
cc50145275 Fix license path 2020-08-10 20:17:27 +03:00
98b69d6492 Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'last_modified' at row 1 2020-08-10 20:17:00 +03:00
e860d1ab76 Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'create_on' 2020-08-10 20:16:34 +03:00
Artem Tarasov
325d497cc0 fixed accept file 2020-08-10 18:40:46 +03:00
Artem Tarasov
d463a4ab25 fixed bugs upload incorrect file license after upload current 2020-08-10 18:25:04 +03:00
Artem Tarasov
70f3098fb2 fixed modal message and accept files 2020-08-10 18:06:20 +03:00
Artem Tarasov
d338f546e0 Added message about successful upload 2020-08-10 13:29:32 +03:00
Artem Tarasov
ef9b4d52e9 added input highlighting 2020-08-10 11:22:49 +03:00
Artem Tarasov
56bd4e8411 fixed upload license 2020-08-10 10:27:58 +03:00
SuhorukovAnton
112a378d28 socket: add bat 2020-08-09 11:34:09 +03:00
SuhorukovAnton
601b063ce8 socket.io: add websocket-sharp 2020-08-08 22:40:40 +03:00
Artem Tarasov
b8d42d53ed fixed language 2020-08-07 22:02:55 +03:00
Ilya Oleshko
0bae66814f Fix: Fixed file upload from form 2020-08-07 17:32:55 +03:00
Artem Tarasov
e6dea2c648 input-file fixed upload same file 2020-08-07 16:57:16 +03:00
Artem Tarasov
3b8796ca93 refactoring 2020-08-07 13:39:53 +03:00
Artem Tarasov
3838c5ae39 fix 2020-08-06 09:44:52 +03:00
Artem Tarasov
c4ba6adee2 fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout 2020-08-06 00:01:41 +03:00
Artem Tarasov
5c8efbd7c5 upload license 2020-08-05 15:27:28 +03:00
518648cb19 Fix parse license 2020-08-04 17:29:43 +03:00
Artem Tarasov
8257c957cb fix upload license 2020-08-04 16:39:05 +03:00
Artem Tarasov
5ccc0fc21c upload fix 2020-08-04 11:48:43 +03:00
58a0b5dd7a Settings: remove check password settings 2020-08-04 10:32:40 +03:00
a9e8c89240 Files: fix add tag 2020-08-04 10:30:09 +03:00
Artem Tarasov
bdeedbbb42 added seLicense() 2020-08-03 22:36:13 +03:00
Artem Tarasov
555eac84b8 add method getIsRequiredLicense 2020-08-03 22:04:49 +03:00
1dd404187b Settings: fix 2020-08-03 18:34:53 +03:00
1701db1a91 Files: fix CompleteVersion 2020-08-03 18:28:34 +03:00
178bf82c28 Settings: fix 2020-08-03 17:06:37 +03:00
39b984debd Settings: added license/required and license upload 2020-08-03 16:42:59 +03:00
Artem Tarasov
afc8803ff4 added timezone transfer 2020-08-03 16:14:05 +03:00