Commit Graph

5698 Commits

Author SHA1 Message Date
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
f6d71ad1f6 Wizard: Complete. Timezone 2020-08-03 15:01:02 +03:00
a6b11e84c5 Settings: Added create timezones 2020-08-03 14:22:22 +03:00
SuhorukovAnton
b5ff2b9feb socket.io: fix 2020-08-03 11:20:57 +03:00
Artem Tarasov
588c043046 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-08-03 11:06:18 +03:00
Artem Tarasov
90cda6ef62 fixed redirect to /login 2020-08-03 10:57:58 +03:00
SuhorukovAnton
3d8d378a90 socket.io: first version 2020-08-02 23:12:45 +03:00
6253b151e1 fix ChangeHistory, UpdateFile, added UpdateComment 2020-08-02 21:48:58 +03:00
0a8bf7f830 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-08-02 21:04:27 +03:00
4b6c0a0261 Merge branch 'master' into feature/Wizard 2020-08-02 21:03:56 +03:00
Artem Tarasov
f988fa5573 refactoring layout 2020-08-01 19:10:21 +03:00
Artem Tarasov
d13383f507 refactoring styles 2020-08-01 02:00:40 +03:00
72ae1f5e9b Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-31 16:49:54 +03:00
Artem Tarasov
652371a42c fixed layout 2020-07-31 16:02:59 +03:00
Artem Tarasov
f95d788516 fixed modal 2020-07-31 15:20:12 +03:00
Artem Tarasov
b40a6d91bc added ErrorContainer if wizard not init 2020-07-31 15:05:28 +03:00
Ilya Oleshko
cfc40a6487
Merge pull request #63 from ONLYOFFICE/feature/new-login-page
Feature/new login page
2020-07-31 14:49:18 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +03:00
Vladislav Makhov
6463e30762 Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page 2020-07-31 13:24:08 +03:00
Vladislav Makhov
1f93279d13 Code format 2020-07-31 13:23:53 +03:00
Artem Tarasov
a1d2c2c4f0 Merge branch 'master' into feature/Wizard 2020-07-30 16:04:11 +03:00
Ilya Oleshko
d575bc610d Merge branch 'master' into feature/new-login-page 2020-07-30 16:03:02 +03:00
Ilya Oleshko
9515f755f4
Merge pull request #59 from ONLYOFFICE/feature/input-password-wizard
Feature/input password wizard
2020-07-30 16:00:37 +03:00