Commit graph

18 commits

Author SHA1 Message Date
Maxim Kadushkin 0ee904ab39 [ALL] removed event for desktop 2018-03-14 17:54:51 +03:00
Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/controller/Toolbar.js
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
2018-02-22 02:41:49 +03:00
Maxim Kadushkin dcd1589adc [common] added 'Desktop' controller 2018-02-22 02:24:03 +03:00
Julia Radzhabova 9c5d1310d9 Don't support IE version <10. 2018-02-20 13:45:35 +03:00
Alexey Golubev d3f81b3dfb
Merge pull request #49 from ONLYOFFICE/master
Back merge to develop
2018-01-25 18:09:03 +03:00
Alexey Golubev f318d9fbc4 fix multi-thread building 2018-01-25 16:48:40 +03:00
Julia Radzhabova b7675946f8 Support for languages with "_" separator (en_US). 2018-01-24 14:40:59 +03:00
Maxim Kadushkin 99db65332a refactoring 2017-07-18 16:33:10 +03:00
Maxim Kadushkin 19c0a3509f inline svg in production html 2017-07-17 14:57:12 +03:00
Maxim Kadushkin 55c1b030a2 optimized logo showing 2017-07-05 14:40:19 +03:00
Maxim Kadushkin 29bdf730c4 changed icon for 'Users ' button 2017-06-30 17:44:19 +03:00
Julia Radzhabova b455ba0a12 Fix Bug 35037. 2017-06-23 16:42:18 +03:00
Maxim Kadushkin 3c3d28aeae debug of deployment 2017-05-04 15:40:15 +03:00
Julia Radzhabova 8d444cd223 Check origin of messages received in api. 2016-12-14 14:20:18 +03:00
Julia Radzhabova b304d3e651 Fix Bug 33115. 2016-09-15 15:59:06 +03:00
Julia Radzhabova 7d4ce1c7a2 Fix bug with loader logo (when no logo-parameter). 2016-09-14 14:01:59 +03:00
Julia Radzhabova 376990a7a6 Added custom logo to loader of the editors (need parameter in config -> customization). 2016-09-14 12:45:10 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00