Commit Graph

46 Commits

Author SHA1 Message Date
c86c6bf17e Merge branch 'develop' into feature/user-image 2023-11-07 11:25:40 +07:00
13c93ce2de java-spring: user avatar 2023-11-03 19:44:33 +07:00
e1d8418055 Merge branch 'develop' into feature/region-protect 2023-11-01 11:12:26 +07:00
f501612067 java-spring: setUsers for region protection 2023-10-30 14:15:09 +07:00
8b5a2aceb0 deleted comments that duplicate the context 2023-10-26 17:11:29 +03:00
4e3f87f692 java-spring: onRequestOpen for referenceData source file 2023-10-26 16:20:30 +03:00
c0051304d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java-spring/src/main/resources/templates/editor.html
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/php/src/views/DocEditorView.php
#	web/documentserver-example/php/templates/docEditor.tpl
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
2023-10-12 11:54:43 +03:00
9457754666 java-spring: onRequestSelectDocument / setRequestedDocument add mapping fix 2023-10-05 11:14:31 +07:00
88a006ac49 java-spring: spreadsheet method and mapping fix 2023-10-02 17:27:25 +07:00
e280291f80 java-spring: onRequestSelectSpreadsheet/setRequestedSpreadsheet 2023-09-28 12:14:33 +07:00
6bdadd6053 Merge remote-tracking branch 'remotes/origin/develop' into refactoring/java-spring-dto 2023-09-07 10:26:03 +03:00
8c518fd109 java-spring: added dto/Rename.java 2023-09-07 10:24:53 +03:00
6511507093 java-spring: added dto/Restore.java 2023-09-07 10:23:34 +03:00
a56b411c93 java-spring: changed restore version without reload page 2023-09-04 15:32:15 +03:00
bc5393e28c java-spring: added api (history, historyData) for getting history 2023-09-04 15:29:23 +03:00
63365e176e java-spring: add restore endpoint 2023-08-03 12:34:14 +04:00
f058d68126 fix bug with switching from view to edit 2023-06-21 11:11:33 +03:00
96368f871c java-spring: hide edit icon on view screen for anonymous 2023-03-14 15:51:33 +05:00
43875b06bf java-spring: ReferenceData 2023-02-15 15:33:07 +03:00
3181c7449d Copyright 2023 2023-01-20 15:27:03 +05:00
e041baeef7 Merge branch 'feature/extension-on-rename' into develop 2022-08-02 14:18:22 +03:00
54bb5b0a24 format 2022-03-28 13:26:17 +03:00
a44787c625 java-spring 2022-03-23 11:11:03 +03:00
416b1fde8c Merge pull request #270 from ONLYOFFICE/feature/hide-history-for-anonymous
Feature/hide history for anonymous
2022-03-22 11:54:12 +03:00
8f09dadfa0 ruby: java-spring: bugfix 2022-03-21 17:10:11 +03:00
0673fed928 java: java-spring: version history button was hidden 2022-03-21 09:35:58 +03:00
fcfb6efda7 java-spring: removed rename action for anonymous 2022-03-18 15:02:45 +03:00
4ba708631e Merge pull request #266 from ONLYOFFICE/feature/renaming-files
Feature/renaming files
2022-03-18 10:31:19 +03:00
eb196613e7 format 2022-03-17 10:36:38 +03:00
0e1a580a86 refactoring 2022-03-11 14:13:09 +03:00
d4d7c4e222 java-spring: meta command 2022-03-11 10:58:54 +03:00
935377a941 all: fix link in mentions 2022-03-02 17:42:12 +03:00
beb9885b03 docxf and oform since v7.0 2021-12-08 14:00:04 +03:00
d3639d1697 java-sprong: added comments 2021-11-18 12:47:26 +03:00
7cd7f1bf66 java-spring: add Save Copy as... 2021-11-15 13:12:42 +03:00
9bab8edc3c using innerAlert in onRequestSendNotify 2021-11-15 11:48:17 +03:00
3556073f5c java-spring: fix switch to edit mode from editor 2021-11-01 15:08:04 +03:00
222749da15 fix path to templates, set username as "", if anonymous 2021-09-23 11:46:18 +03:00
cfa859a65f java-spring: version fix 2021-08-23 23:31:22 +03:00
9baa4c59b3 java-spring: refactoring 2021-08-20 16:25:49 +03:00
2d51ddde3d java-spring: add createUrl to editorConfig and creating from templates 2021-07-29 13:32:23 +03:00
d5f5079c22 java-spring: remove templates field from Permissions, fix version history 2021-07-29 12:34:12 +03:00
038c74664a java-spring: fix favorite, add templates permission, 2021-07-06 18:07:27 +03:00
d1903e4354 java-spring: favorite flag, file creation and file samples, separated class for "/track" (TrackManager and FileController) 2021-07-06 15:23:13 +03:00
f9bb10c3df java-spring: users for mentions, gson to jackson, rename documentManager to segregated documentManagerExts 2021-07-05 15:46:07 +03:00
2c03521148 java-spring: Integration example 2021-06-21 17:33:24 +02:00