summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Simplify download processdistro/cib/libreoffice-6-2Szymon Kłos2020-09-097-36/+79
| | | | | | | | | | | | | Use hash to identify download and pass that to the client. This allows us to reduce parameters for download requests. DocBroker maps download ids to URL in the file system. Change-Id: I254d4f0ccaf3cff9f038a817c8162510ae228bc5 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101992 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
* Release 6.2.12.0Samuel Mehrbrodt2020-09-081-1/+1
| | | | Change-Id: I552114d06222705e77cb9c266887b5ae80583af8
* Consider save successful also when doc changed in storageSamuel Mehrbrodt2020-09-081-1/+4
| | | | | | Ported from master fix 8c602e179e8afe44f2a1fe513bdc7640cd57ed2a Change-Id: Iaf52e950cc635d625c1415754b9d411d0a009927
* fix username formattingSamuel Mehrbrodt2020-09-082-2/+3
| | | | | | | | | | Inspired by bc0920178aef2bcb7affe989fa79309fe131aec4 Change-Id: Ie82bccaf371b4c200c906125548eb24008e84c61 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102006 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
* Release 6.2.11.0Samuel Mehrbrodt2020-08-051-1/+1
|
* Don't update modified status after saving to storage failsSamuel Mehrbrodt2020-08-053-0/+13
| | | | | | Otherwise client gets a notification that document is unmodified. This should not happen, as the document in the storage has not been updated and so it should be considered as modified until saving to storage succeeds.
* Fix response nameSamuel Mehrbrodt2020-07-091-1/+1
|
* Release 6.2.10.0Samuel Mehrbrodt2020-07-081-1/+1
|
* Improve reporting save resultsSamuel Mehrbrodt2020-07-081-4/+4
| | | | | | | | | Change-Id: I3f2f96f4b8f196e6e9268bed24695f739f679124 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97699 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e71e37bcec84068e92434357df6172b9cf457e7e)
* Report back load result to integratorSamuel Mehrbrodt2020-07-085-4/+48
| | | | | | | | Integrator currently gets no message when loading the document from WOPI host fails. Similiar to Action_Save_Resp, introduce Action_Load_Resp with the result of the load action.
* Release 6.2.9.0Samuel Mehrbrodt2020-07-011-1/+1
|
* Report back real save resultSamuel Mehrbrodt2020-07-017-17/+54
| | | | | | | 665b1629de30a4a402c6b10dd542de158db1f428 was not correct, as it reported back the save result of the internal save (which usually succeeds). Instead we want to know the save result of the remote storage (WOPI/Webdav). So report that back instead.
* typoAndras Timar2020-07-011-1/+1
| | | | | Change-Id: Iaa986b700fecb10561d03008c291c9a7bf9df244 (cherry picked from commit e0f8001e3a439250fd51ba4c00f5b44627ed8e6c)
* Use Python 3 for loleaflet/util/po2json.py, tooAndras Timar2020-07-011-2/+1
| | | | | Change-Id: I8f7aec078fba975eb516a497c1a287ed6a37e9e1 (cherry picked from commit 4a589e90b2938d2b121dc7086044fbb7d6d3525b)
* Release 6.2.8.0Samuel Mehrbrodt2020-06-041-1/+1
|
* tdf#131123 Report back save resultSamuel Mehrbrodt2020-06-043-11/+24
| | | | | | | | | Change-Id: Ie3dee5d344bc65c325b95f2746c9734bdd9e2f9d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94490 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 665b1629de30a4a402c6b10dd542de158db1f428)
* Release 6.2.7.0Samuel Mehrbrodt2020-04-141-1/+1
|
* tdf#123482 - cleanup convert-to folder even more reliably.Michael Meeks2020-04-143-3/+20
| | | | | | | | | | Problems could occur if exceptiosn thrown when parsing the input stream. Change-Id: Id82b3816450194164fc2093554c730b4a94acef1 Reviewed-on: https://gerrit.libreoffice.org/72695 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 1845ed42af661dbb7b10a2fb4686ce2c8ef7e521)
* Don't count convert-to connections vs. the document count.Michael Meeks2020-04-143-6/+23
| | | | | Change-Id: I350905fb98c503ae8f22a377e4af5cbcb9f3c52d (cherry picked from commit d8bb92cdcf83216ae5a56b8602cbd9f7c72b4975)
* tdf#123482 - cleanup convert-to folder more reliably.Michael Meeks2020-04-144-8/+31
| | | | | Change-Id: I029bb4136984e05485e462c92da80b92b00fdebc (cherry picked from commit 2d473222e4cad399b131345395d6506b26e0e134)
* Simpify DocumentBroker constructor.Michael Meeks2020-04-143-10/+7
| | | | | Change-Id: I0bf29df9316b129d34862c7464bb6636d42a850d (cherry picked from commit 51b72b04a9e0c39df525caeb0744ca44a8ba0143)
* Avoid using un-necessary reference.Michael Meeks2020-04-141-10/+15
| | | | | Change-Id: Id5a9fed8fb790f2af8facac119e9e0da476b1e47 (cherry picked from commit b255ce528bb6c7d037c99ff612a8efba92182abd)
* Release 6.2.6Samuel Mehrbrodt2019-07-301-1/+1
|
* Remove space below rulerSamuel Mehrbrodt2019-07-301-4/+0
| | | | | | | | This breaks cursor positioning with the mouse. Was introduced with 0576a3cced4c27be940a831d6735ece533a2a47d Change-Id: I85abca224d2bc9d365443bd87c6793db1900e2a4
* net: avoid UB in WebSocketHandler::readPayload()Miklos Vajna2019-07-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seen when closing a Writer document. /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_vector.h:798:9: runtime error: reference binding to null pointer of type 'char' #0 0x6ff633 in std::vector<char, std::allocator<char> >::operator[](unsigned long) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_vector.h:798:2 #1 0x770d0c in WebSocketHandler::readPayload(unsigned char*, unsigned long, unsigned char*, std::vector<char, std::allocator<char> >&) /home/vmiklos/lode/dev/online/./net/WebSocketHandler.hpp:611:29 #2 0x759324 in WebSocketHandler::handleTCPStream(std::shared_ptr<StreamSocket> const&) /home/vmiklos/lode/dev/online/./net/WebSocketHandler.hpp:251:13 #3 0x6f820d in WebSocketHandler::handleIncomingMessage(SocketDisposition&) /home/vmiklos/lode/dev/online/./net/WebSocketHandler.hpp:419:20 #4 0xb2da64 in ClientSession::handleIncomingMessage(SocketDisposition&) /home/vmiklos/lode/dev/online/wsd/ClientSession.cpp:74:14 #5 0xa70a61 in StreamSocket::handlePoll(SocketDisposition&, std::chrono::time_point<std::chrono::_V2::steady_clock, std::chrono::duration<long, std::ratio<1l, 1000000000l> > >, int) /home/vmiklos/lode/dev/online/./net/Socket.hpp:1037:29 #6 0x6ec83d in SocketPoll::poll(int) /home/vmiklos/lode/dev/online/./net/Socket.hpp:570:34 #7 0x830019 in DocumentBroker::pollThread() /home/vmiklos/lode/dev/online/wsd/DocumentBroker.cpp:286:16 #8 0x8fdb38 in DocumentBroker::DocumentBrokerPoll::pollingThread() /home/vmiklos/lode/dev/online/wsd/DocumentBroker.cpp:165:20 #9 0xe00e75 in SocketPoll::pollingThreadEntry() /home/vmiklos/lode/dev/online/net/Socket.cpp:184:9 #10 0xe49cfd in void std::__invoke_impl<void, void (SocketPoll::*)(), SocketPoll*>(std::__invoke_memfun_deref, void (SocketPoll::*&&)(), SocketPoll*&&) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:73:14 #11 0xe4980a in std::__invoke_result<void (SocketPoll::*)(), SocketPoll*>::type std::__invoke<void (SocketPoll::*)(), SocketPoll*>(void (SocketPoll::*&&)(), SocketPoll*&&) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:95:14 #12 0xe496bd in decltype(std::__invoke(_S_declval<0ul>(), _S_declval<1ul>())) std::thread::_Invoker<std::tuple<void (SocketPoll::*)(), SocketPoll*> >::_M_invoke<0ul, 1ul>(std::_Index_tuple<0ul, 1ul>) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/thread:234:13 #13 0xe494c7 in std::thread::_Invoker<std::tuple<void (SocketPoll::*)(), SocketPoll*> >::operator()() /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/thread:243:11 #14 0xe4888a in std::thread::_State_impl<std::thread::_Invoker<std::tuple<void (SocketPoll::*)(), SocketPoll*> > >::_M_run() /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/thread:186:13 #15 0x7f2c5805fe2e in execute_native_thread_routine /home/vmiklos/lode/packages/gccbuild/x86_64-pc-linux-gnu/libstdc++-v3/src/c++11/../../../../../gcc-7.3.0/libstdc++-v3/src/c++11/thread.cc:83 #16 0x7f2c57a3c558 in start_thread (/lib64/libpthread.so.0+0x7558) #17 0x7f2c5715082e in clone (/lib64/libc.so.6+0xf882e) SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_vector.h:798:9 in Change-Id: Ifaf6b193e9bba480587c2e184df55aa0728bb370 Reviewed-on: https://gerrit.libreoffice.org/76331 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 43457a0aaf317c2c2c9594778aef891f58fc5827)
* fix: saveAs breaks when '%' character is used within the filenameEduard Ardeleanu2019-07-303-9/+13
| | | | | | | | | | | Change-Id: I2df059abd67be88acae8bd44ae2c74be7778a595 Reviewed-on: https://gerrit.libreoffice.org/69424 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/76329 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit d54344b6ee0cab224c5184b1d4fe15edf733be77)
* Added support for defragmentation of incoming websocket fragmented messages ↵Gabriel Masei2019-07-301-86/+182
| | | | | | | | | | | | | and handled some protocol error cases Change-Id: I4d11a6527b6b131c65101fd53b71015529645f74 Reviewed-on: https://gerrit.libreoffice.org/68901 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/76327 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 1a9e34581c281b4d43c60aff2628bcc996fdc025)
* detecting password protected files on convertToEduard Ardeleanu2019-07-301-3/+22
| | | | | | | | | | | | | Fail-fast when a file cannot be converted, using convertTo REST API, if the file is password protected and the password wasn't received. Change-Id: I32d807bcecbbe72a38a70fec74caf13638803e1d Reviewed-on: https://gerrit.libreoffice.org/72891 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/76330 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 5fe0a1455c95e5e23699801b951a000e5f8439e6)
* Fix indentationSamuel Mehrbrodt2019-07-241-6/+6
|
* Font list empty in some casesSamuel Mehrbrodt2019-07-191-80/+34
| | | | | | | | | | | | | The list of font sizes was taken from the font info. This causes problems when the document uses a font which is not available on the system. As there is no obvious reason, why the list of font sizes should depend on the font (and update with every font change), remove this dependency and just populate the list of fonts once. If the document uses a font size which is not in the list, it still will be added to the font size list. Change-Id: I4d434244b341c8e782138e5a6df85a50ddad3df5
* Alow to modify UI before WOPIPostmessageReadySamuel Mehrbrodt2019-07-181-21/+22
| | | | Manually ported from 35905035a627c8e46c665cb625792f242f2a53ff
* Fix "BackColor" tooltipSamuel Mehrbrodt2019-07-182-3/+3
|
* resizeToolbar is undefinedSamuel Mehrbrodt2019-07-181-2/+1
| | | | | | | | But it inserting buttons seems to work fine even without that call, so just remove it. Change-Id: I831b171c57feed82e1ca778ba5a16a382f1786ee (cherry picked from commit 46f318c3584b810cc1b366c3510c8871b4eca886)
* Release 6.2.5Samuel Mehrbrodt2019-07-151-1/+1
|
* leaflet: fire Doc_ModifiedStatus with modified state of the documentAshod Nakashian2019-07-154-2/+43
| | | | | | | | | | | | | | | | | | When .uno:ModifiedStatus is received, now Doc_ModifiedStatus is fired to inform the client of the modified state of the document. This is useful in case the integration needs to prompt the user to save before closing the document (which they can catch with the onunload or onbeforeunload events in the browser, as well as with our UI_Close when the default handler is disabled). Includes working sample and documentation. Change-Id: Ief30483e2f078b0aa9f3c006a1ecb4093375174c Reviewed-on: https://gerrit.libreoffice.org/74891 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 08f9439cdf32d668b04af0912fa2cff18dda6a0c)
* leaflet: support disabling default actionAshod Nakashian2019-07-158-5/+77
| | | | | | | | | | | | | | | | | | | | | | | Clients often need to handle certain commands themselves. This is especially true for Action_Save and Action_Close. A new postMessage command, Disable_Default_UIAction, is now available to support disabling/enabling the default action for certain commands (as of this patch, only Action_Save and Action_Close are supported). The actions in question issue a notification and, when the default handler is disabled, the client is expected to handle the notification for which they disabled the default handler and act as necessary. See reference.html for more details. Change-Id: Ia6ce4e2d7578f79cc2069097e0b968e6c4aeabd1 Reviewed-on: https://gerrit.libreoffice.org/74136 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 04064878fc24d910435ca0162c2f37b68b493d58)
* wsd: don't use DocBrokers marked to be destroyedAshod Nakashian2019-07-011-2/+2
| | | | | | | | | | | | | | There are cases when we do get client-requests while we are about to unload and destroy the DocBroker. This protects against the use of partially-destroyed DocBroker (specifically, when TileCache is already destroyed). Change-Id: I963f2239fd62280e70b1938d3c6f653e8af91b1e Reviewed-on: https://gerrit.libreoffice.org/74132 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit cba106de61771a2da86689f990ff616c99fcefa6)
* leaflet: support Action_CloseAshod Nakashian2019-07-013-1/+19
| | | | | | | | | | | | | | | | This allows for clients to issue a document close programmatically, which is useful when they have custom buttons or commands, or external events/triggers, that might result in cleanly closing the document. A demo of how to use it is included in framed.doc.html. Change-Id: Ib889bb01bbcaaa91fd0f341c989aeb1a6fceec28 Reviewed-on: https://gerrit.libreoffice.org/74131 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 08d72efe37f36aad64eccff807972e49c9b13911)
* leaflet: show/hide commands demoAshod Nakashian2019-07-011-1/+30
| | | | | | | | | | | | | | | This demonstrates the use of show and hide functionality via Show/Hide_Button and Show/Hide_Menu_Item postMessage events. Save and Print buttons and menu items are controlled in the demo. Change-Id: I81dfea816765da50a1c20699b460765ae35f60a6 Reviewed-on: https://gerrit.libreoffice.org/74130 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 439eb0b98bbedaf8ea2cf016bd2c3bae5c56a2cd)
* Cleanup framed.doc.html sampleAshod Nakashian2019-07-011-20/+26
| | | | | | | | | | | | Now Host_PostmessageReady is automatically issued upon loading and the postMessage calls are more modular, allowing for expansion with more functionality. Change-Id: I22b50f7228e0fd32c4cb880f4981c1a455038d48 Reviewed-on: https://gerrit.libreoffice.org/74129 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 0b7cc06e602d8c45fc667d96b1c66ad17fee44bd)
* Remove obsolete checksSamuel Mehrbrodt2019-06-282-14/+0
| | | | Duplicate/useless after c358ddc227038f55f4cff854ba73c95558a375bc
* Use pkill to kill process instead of killallSamuel Mehrbrodt2019-06-252-3/+3
| | | | | | Using killall does not work, it gives 'no process found'. Change-Id: I0e528ab8c0f6f0c4cb06ea5e6c436aecf2274688
* configure: Add support for custom iconsSamuel Mehrbrodt2019-06-252-0/+17
| | | | | | Add changes from master patch Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9
* Add some messages whether we are building with support keySamuel Mehrbrodt2019-06-211-0/+3
| | | | | Change-Id: If41767c549e9e46b7f0a6f23fa5d819a946f9bdb (cherry picked from commit 4691d2b18a1e20e286672083eb9a57443c6f8ce3)
* configure: Add support for custom iconsSamuel Mehrbrodt2019-06-212-0/+18
| | | | | Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 (cherry picked from commit 50a9da56aa466add3e25f3a8785e24f5996a554c)
* Release 6.2.4Samuel Mehrbrodt2019-06-121-1/+1
|
* Fix toolbar to behave like in masterSamuel Mehrbrodt2019-06-121-2/+3
| | | | | * Rename changed toolbar id * Hide not remove background color button
* Add API methods to hide/show rulerSamuel Mehrbrodt2019-06-122-0/+19
| | | | | Change-Id: I4d14d9d68e7ebda56c80a1ad678a21c67ffd5ac2 (cherry picked from commit 5754d0593975fa63dfc3593ec5ff31117ea41a21)
* Use LO branding colors for loading progress barSamuel Mehrbrodt2019-06-121-6/+6
| | | | | | | | | | From https://wiki.documentfoundation.org/Marketing/Branding Change-Id: I7d3d5932ef67ae5c1a522d03e1d1a0a8960b0816 Reviewed-on: https://gerrit.libreoffice.org/73107 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 43f09f284ca9be50913a3799c0c98137a1fdf42c)
* Add API method to remove elements from statusbarSamuel Mehrbrodt2019-06-122-1/+31
| | | | | | | | Change-Id: Ie45d67e642fdd72afb79391cce88c9e25f0b53b8 Reviewed-on: https://gerrit.libreoffice.org/72851 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3f31de251edc2df7df9bf8a94e3e38852686a8b2)
generated by cgit (git 2.34.1) at 2024-05-07 07:00:47 +0000