Commit Graph

1949 Commits

Author SHA1 Message Date
Artem Tarasov
f2c39cd592 added common settings, translation 2020-08-20 11:27:00 +03:00
Artem Tarasov
cdbeea4741 added translation, admin settings 2020-08-19 18:16:31 +03:00
Artem Tarasov
6130af291e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 16:14:59 +03:00
Artem Tarasov
4754a84483 fixed routing 2020-08-19 16:14:21 +03:00
56af481750 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-19 10:38:50 +03:00
8fb4214a1f Web: Files: added aside panel to context-menu-button, added new translation 2020-08-19 10:38:43 +03:00
142232d0af Web: People: added aside panel to context-menu-button, added new translation 2020-08-19 10:38:34 +03:00
Artem Tarasov
7d4b18405e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-18 17:27:20 +03:00
Artem Tarasov
1e6a2c37dc added Routing, refactoring 2020-08-18 17:23:30 +03:00
2b37363939 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-18 17:04:01 +03:00
a7aef2667d Web: Files: added translations 2020-08-18 17:00:12 +03:00
Artem Tarasov
b4d837320e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-18 15:55:50 +03:00
7a813247af Web: Clients: fixed url to loading translation.json for products 2020-08-18 11:18:44 +03:00
c16c9b280a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-17 14:19:19 +03:00
673860f987 Web Files Client: simplified configuration of i18n (+ removed useless requests) 2020-08-17 14:17:44 +03:00
ac6dfbaebc Web People Client: simplified configuration of i18n (+ removed useless requests + removed useless Import page) 2020-08-17 13:17:38 +03:00
Artem Tarasov
e35f7a8ebf fixed styles (svg icons in tree nodes, margin-top) 2020-08-14 18:28:01 +03:00
Artem Tarasov
d969cac7e9 created TreeSettings, added translate 2020-08-14 17:19:12 +03:00
b15ad23ab9 Web: Files: fixed styles 2020-08-14 17:07:30 +03:00
7bd1e7abe1 Web: Files: added version api 2020-08-14 13:02:23 +03:00
6d92275269 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-08-14 11:42:13 +03:00
58fffc1756 File: fix revision 2020-08-14 11:35:34 +03:00
Alexey
fada82ae41 Web: Components: Fix rotate in avatar editor 2020-08-14 08:29:15 +03:00
9299193f6c Web: Files: fixed embedding link, fixed share link 2020-08-13 15:56:24 +03:00
0626d82fa8 Web: Files: added unblock/check-in api 2020-08-13 14:42:29 +03:00
2616e8a8dd Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 12:02:07 +03:00
37df28d1a9 Web: Files: fixed badge error 2020-08-13 12:02:00 +03:00
62c5bd5244 Merge branch 'master' into feature/files 2020-08-13 11:53:47 +03:00
cbf9630d7f File: added Locked, LockedBy 2020-08-13 11:52:59 +03:00
b60dad90b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 09:59:13 +03:00
ef15a36cf8 Web: Files: added icons to context menu actions 2020-08-13 09:59:05 +03:00
d6ff0d6a44 Merge branch 'master' into feature/files 2020-08-12 18:26:28 +03:00
6782269c7f Files: lock file 2020-08-12 18:13:52 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
3a37e0839a Files: fix FileShareLink 2020-08-12 17:34:54 +03:00
c0f82fdf71 Web: Files: added Unblock/Check-in 2020-08-12 14:39:04 +03:00
181c1e52f4 Web: Files: added version history api 2020-08-12 11:08:04 +03:00
f3749c1c94 Web: Files: fixed version styles 2020-08-12 10:14:40 +03:00
Ilya Oleshko
abc2bcc03c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-11 15:57:35 +03:00
Ilya Oleshko
7ac9ad6c62 Web: People: Reassign: Fixed page wrapper 2020-08-11 15:51:27 +03:00
Ilya Oleshko
6df4e05bd9 Web: People: ProfileAction: Fixed page wrapper 2020-08-11 15:50:15 +03:00
Ilya Oleshko
bbc57115a3 Web: People: Profile: Fixed page wrapper 2020-08-11 15:49:54 +03:00
Ilya Oleshko
ade0c7d149 Web: People: Import: Fixed page wrapper 2020-08-11 15:49:40 +03:00
Ilya Oleshko
94f447a272 Web: People: Home: Fixed page wrapper 2020-08-11 15:49:22 +03:00
Ilya Oleshko
5d3f75b7ed Web: People: GroupAction: Fixed page wrapper 2020-08-11 15:49:03 +03:00
Ilya Oleshko
30c17e3220 Web: Files: VersionHistory: Fixed page wrapper 2020-08-11 15:48:37 +03:00
Ilya Oleshko
9d703ec01e Web: Files: Home: Fixed page wrapper 2020-08-11 15:48:17 +03:00
07116cfea6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-11 14:37:40 +03:00
f071702b77 Web: People: fixed profile routing 2020-08-11 14:37:03 +03:00
Ilya Oleshko
71a2f02cdc Web: Files: Home: Moved function initialization out of render 2020-08-11 11:15:54 +03:00