Commit graph

676 commits

Author SHA1 Message Date
Julia Radzhabova cd8e7c9023 Merge branch 'feature/doc-info' into develop 2019-06-21 17:27:49 +03:00
Julia Radzhabova 59edd743d2 Update document info when accept changes 2019-06-21 17:17:02 +03:00
Julia Radzhabova 244edfe69a Document info: undo changes by Esc button 2019-06-21 16:35:23 +03:00
Julia Radzhabova e6fb81e205 Refactoring documnt info changing 2019-06-21 15:37:11 +03:00
Julia Radzhabova d7abed8f38 [DE] Lock document info settings 2019-06-21 15:14:24 +03:00
Julia Radzhabova aa9c0a2f5c Apply document info (subject, title, comment, authors) 2019-06-21 14:34:40 +03:00
Julia Radzhabova 15aac51ab4 Menu component: refactoring, adjust menu to browser height 2019-06-21 10:46:00 +03:00
Julia Radzhabova 20a45dda5f Menu component: change scroll 2019-06-20 14:32:10 +03:00
Julia Radzhabova 152a8d53f3 Merge branch 'feature/watermark' into develop 2019-06-19 11:30:46 +03:00
Julia Radzhabova 62dbe2e80d [DE] Watermark: disable Ok button when image is not loaded 2019-06-19 11:22:10 +03:00
Julia Radzhabova 45a82b8442 [DE] Watermark: save language settings 2019-06-18 16:20:52 +03:00
Julia Radzhabova 1fcc5190e5 [DE] Change watermark button 2019-06-18 12:35:01 +03:00
Julia Radzhabova 23c85be00e [DE] Refactoring watermark settings 2019-06-18 12:22:24 +03:00
Julia Radzhabova 4ac3503435 [DE] Get/put watermark settings 2019-06-17 17:05:27 +03:00
Julia Radzhabova 468ed1ef84 Fix Bug 40504 2019-06-14 10:53:20 +03:00
Alexander.Trofimov 8ce8178389 [de] Refactorig
Delete asc_CChartStyle. Use CStyleImage. asc_getImageUrl -> asc_getImage, asc_getStyle -> asc_getName
2019-06-11 18:23:43 +03:00
Julia Radzhabova 4321974f75 Use ButtonsArray for group of buttons 2019-06-11 14:27:25 +03:00
Julia Radzhabova e347b92a0f Use ButtonsArray for group of buttons 2019-06-11 10:52:13 +03:00
Julia Radzhabova 756a02cfb9 Merge branch 'develop' into feature/buttons-set 2019-06-10 17:53:29 +03:00
Julia Radzhabova 2e87bd7afa [DE][PE] Add tooltips for table styles 2019-06-10 16:01:10 +03:00
Julia Radzhabova 863e500d67 Refactoring buttons render 2019-06-10 13:45:38 +03:00
Alexander.Trofimov 964220a560 [de][pe] Refactoring
Table get_Image -> asc_getImage, get_Id -> asc_getId
2019-06-07 18:07:49 +03:00
Julia Radzhabova 70654ad700 Fix bug with multi-gradient 2019-06-07 14:15:15 +03:00
Julia Radzhabova e02ef3e65f [DE] Bug 40719: textart settings. 2019-06-06 17:20:05 +03:00
Julia Radzhabova 5fe0c2027c [DE] Bug 40719: thumbs count in slider > 2. Change shape settings for multi-gradient. 2019-06-06 15:03:38 +03:00
Julia Radzhabova 42391fdea4 Refactoring toolbar lock 2019-05-29 16:49:52 +03:00
Julia Radzhabova 24ecdef872 [SSE] Add translation for header/footer settings 2019-05-28 13:00:42 +03:00
Maxim Kadushkin cc7b8102ca Merge branch 'release/v5.3.0' into develop
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
2019-05-22 16:02:54 +03:00
Julia Radzhabova fceec13206 [PE] Add document info 2019-05-16 15:59:39 +03:00
Julia Radzhabova 59fb4182fb [SSE] Add document info 2019-05-16 11:52:49 +03:00
Julia Radzhabova 08bdb152a7 [DE] Fix loading document info, add translation 2019-05-16 11:49:13 +03:00
Julia Radzhabova d17b3041f3 Merge branch 'release/v5.3.0' into feature/doc-info 2019-05-15 17:29:22 +03:00
Julia Radzhabova bd8e1861ed [DE] Doc info: hide total editing time 2019-05-15 16:49:11 +03:00
Julia Radzhabova 63762a25bd [DE] Doc info: get editing time and authors 2019-05-15 16:28:18 +03:00
Julia Radzhabova e9391d3079 [DE] Update document info 2019-05-15 14:17:29 +03:00
Julia Radzhabova 8962ca6400 [DE] Watermark: load text for different languages 2019-05-08 14:38:39 +03:00
Julia Radzhabova 82c4adf441 [DE] Watermark settings: disable non-active controls 2019-05-06 14:41:58 +03:00
Julia Radzhabova 5f27be56af Update translation 2019-04-29 15:36:01 +03:00
Julia Radzhabova 6a85389a24 Bug 41351 2019-04-22 17:29:30 +03:00
Julia Radzhabova d2e4a60427 [DE] Review changes: go to moved text from context menu 2019-04-15 17:37:15 +03:00
Julia Radzhabova 3c8576675e [DE] Fix Bug 41235 2019-04-15 10:52:12 +03:00
Julia Radzhabova 99f7070c7a Fix Bug 41189 2019-04-11 13:09:28 +03:00
Julia Radzhabova 2bbfec1e18 [PE][SSE] Add crop for images and shapes to context menu 2019-04-09 14:29:51 +03:00
Julia Radzhabova 3fbf4713e8 [DE] Add crop for images and shapes to context menu 2019-04-09 13:41:08 +03:00
Julia Radzhabova 022ea639e0
Merge pull request #156 from ONLYOFFICE/feature/crop
Feature/crop
2019-04-09 10:29:06 +03:00
Julia Radzhabova 4aa5927bec [DE] Add translation for crop 2019-04-09 10:21:03 +03:00
Julia Radzhabova 3adde58fde Fix Bug 41097 2019-04-08 18:40:08 +03:00
Julia Radzhabova 1059e35da2 [DE] Disable crop button when can't crop image 2019-04-08 11:04:34 +03:00
Julia Radzhabova 08dc88dc98 [DE] Add crop for images 2019-04-05 17:36:15 +03:00
Julia Radzhabova a982f24fba [DE] Change watermark layout 2019-04-05 15:03:01 +03:00