Commit graph

3218 commits

Author SHA1 Message Date
Pranav Kant
6ff4cd69f0 loleaflet: Handle 'invalidateviewcursor' and show colored cursors
... for different views based on view ids received from the
server.
2016-08-07 21:39:54 +05:30
Pranav Kant
0284235da1 loleaflet: Support for non-blinking colored cursors 2016-08-07 21:39:54 +05:30
Pranav Kant
726b213dcf loleaflet: Add viewId to color mapping; using colordata.hxx 2016-08-07 21:39:54 +05:30
Pranav Kant
8dd2987871 loleaflet: Store viewId of the view received in 'status:' command 2016-08-07 21:39:54 +05:30
Pranav Kant
d144d4ac47 loleaflet: Separate blinking-cursor property from cursor
... so that it is possibe to make cursor non-blinking whenever we
want. This will be used in subsequent commits for view cursors.
2016-08-07 21:39:54 +05:30
Henry Castro
77224486f2 loleaflet: add drag & drop Column/Row resize 2016-08-07 11:13:59 -04:00
Jan Holesovsky
2100dc8489 Update the .deb changelog, and allow passing params. 2016-08-05 18:39:32 +02:00
Jan Holesovsky
7e09bff7a5 Some more specfile tweaks. 2016-08-05 13:34:35 +02:00
Jan Holesovsky
5e91d6a15d Allow specifying a name suffix. 2016-08-05 01:32:14 +02:00
Henry Castro
3336af0804 loleaflet: add Column/Row cursor resize 2016-08-04 16:52:00 -04:00
Jan Holesovsky
d60a8848d2 Pull translations from Pootle.
(cherry picked from commit ed0861c9c00a20dd4f9c35725860a409f2e52a92)
2016-08-04 10:34:18 +02:00
Jan Holesovsky
3b3c8760c2 We are using large icons from the Breeze theme, update the Calc toolbar. 2016-08-04 10:03:16 +02:00
Jan Holesovsky
b7619f93d5 Remove unused images: we don't use small images any more.
It was a bad idea keeping them around, apparently they are confusing people...
2016-08-04 10:03:07 +02:00
Miklos Vajna
6c48dfdcf8 Png: avoid performing multiplication at int precision
When the result will be stored at size_t precision anyway.

Change-Id: Ic52904d853eb27972d545fea6e742bc9e0d48c3d
2016-08-04 09:48:38 +02:00
Pranav Kant
9f1070ded7 loolwsd: forward notification for LOK_CALLBACK_VIEW_CURSOR_VISIBLE too 2016-08-03 19:50:25 +05:30
Pranav Kant
1e26b2ea46 loolwsd: Add missing view callbacks to LOKitHelper 2016-08-03 19:07:34 +05:30
Pranav Kant
1350ac3ee9 loleaflet: Expose more global variables
'title' is accessed by loleaflet, so need to expose this too.
2016-08-03 18:27:23 +05:30
Pranav Kant
b99d51616c loleaflet: Update README for updating dependencies 2016-08-03 15:45:01 +05:30
Pranav Kant
5014cb8cc2 loleaflet: Bump jquery-contextmenu to 2.2.3
With current version, position of context menu is not set at
specified position. 2.2.3 fixes the issue.

Also udpate tarballs in node_shrinkwrap and dep. tree in
npm-shrinkwrap.json
2016-08-03 15:45:01 +05:30
Pranav Kant
484c664445 loleaflet: Shrinkwrap and shrinkpack; local dependencies tarballs
Using npm-shrinkwrap, we are locking in our dependency tree
completely, leaving no scope of being affected by any
regression in any of the dependencies. In other words, all of the
dependency tree is dumped in npm-shrinkwrap.json file.

Using shrinkpack, we are also committing these tarballs of
dependencies in node_shrinkwrap/, so that, we are not
depending on npm registry at all during our build process. Since these
are just tarballs, its also better space-wise than committing
node_modules/ per se.

Developers when want to update any dependency should bump the
version in package.json, and also commit the new copy of
tarballs in node_shrinkwrap/.

See: https://github.com/JamieMason/shrinkpack for more info.
2016-08-03 15:45:01 +05:30
Pranav Kant
ebacc6624a loleaflet: Bump jquery version to 2.2.4
Mainly because one of the dependency depends on it, so why have
two different versions of jquery in our dep tree.
2016-08-03 15:45:01 +05:30
Pranav Kant
38d574476b loleaflet: Remove unused dependencies
Commented out devDependencies; these are required for testing framework
inherited from upstream leaflet, but we do not have such tests as of
now for loleaflet.

Move them to devDependencies when need arises.
2016-08-03 15:45:01 +05:30
Pranav Kant
9ebb23aa77 loleaflet: Ununsed dependency
Can't find it being used anywhere.
2016-08-03 15:45:01 +05:30
Pranav Kant
51590125de loleaflet: Bump select2 version
We need https://github.com/select2/select2/issues/3287 which is
fixed in 4.0.1
2016-08-03 15:45:01 +05:30
Pranav Kant
0a7d6d7794 loleaflet: Remove unused files; bower config and publish scripts
This is only leaflet related, not needed in loleaflet.
2016-08-03 15:45:01 +05:30
Pranav Kant
d85127eda3 loleaflet: These are not needed now as we browserify
... and use them from node_modules/ directly now.
2016-08-03 15:45:01 +05:30
Pranav Kant
a69eea3d58 loleaflet: Modularize all of the CSS; browersify-css
Follow the same approach to bundle everything into a single file
as done for the js files in previous commit.
2016-08-03 15:45:01 +05:30
Pranav Kant
5b6df600a7 loleaflet: Modularize all of the js; use browserify
Don't include each third party script in a separate <script> tag,
rather have one single main.js file require'ing these different
scripts. Then `browserify' on main.js which bundles everything
into a single bundle.js containing all of the dependencies.

Also add these 3rd party scripts such as jquery, jquery-ui,
select2 etc. using npm, rather than manually downloading their
files from the internet. This should ease the process of managing
these front-end dependencies; upgrade process should be very easy
now.
2016-08-03 15:45:01 +05:30
Pranav Kant
1410f34d0f loleaflet: Consistency, start url with /loleaflet 2016-08-03 15:45:01 +05:30
Pranav Kant
2b5418a151 loleaflet: Typo; Colon -> comma operator 2016-08-03 15:45:01 +05:30
Pranav Kant
7f84b2eb4c loleaflet: Update license field
specifying the type and URL is deprecated:

https://docs.npmjs.com/files/package.json#license
http://npm1k.org/

(inspired from 6a6d833a2f407bad37587f5e30bf56fb539e7f8d in
upstream Leaflet)
2016-08-03 15:45:01 +05:30
Pranav Kant
efbd0a4940 loleaflet: Fix incorrect info in README 2016-08-03 15:45:01 +05:30
Miklos Vajna
e562ea644e Log: mark move constructor noexcept
It's a good practice in general, since otherwise such classes can't be
put into e.g. STL containers.

Change-Id: Iedf8bab45170c3b7721e88493811d8839487ecab
2016-08-03 10:02:14 +02:00
Miklos Vajna
195b72a921 Log: use std::move() when a value is passed
No move would actually happen in the second case.

Change-Id: I7cc7d9e2a55a17d19845e98a0d829b168b614529
2016-08-02 09:29:25 +02:00
Michael Meeks
9a0c5d8571 Continue nocaps work to improve valgrindability. 2016-08-01 16:45:12 +01:00
Miklos Vajna
b3ddeb783b LOOLWSD: catch exception by const ref
Change-Id: I9e505ac242e4660be586a5d6652cc79203f1a6ac
2016-08-01 09:18:05 +02:00
Ashod Nakashian
a5716da8f8 loolwsd: fail gracefully on invalid file requests
Change-Id: I576623de1251c916f3a54dca8e470d8989710e40
Reviewed-on: https://gerrit.libreoffice.org/27687
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-29 12:43:43 +00:00
Ashod Nakashian
b04f29b679 loleaflet: dim the UI after 30 seconds of losing focus
Change-Id: I28239eb92e758b45d10e260c7a8f616062b22839
Reviewed-on: https://gerrit.libreoffice.org/27681
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-29 11:59:56 +00:00
Miklos Vajna
e36649c13b Auth: clean up unnecessary value parameters
Change-Id: Ia797171880ea1dd790d67a150f198c8306354045
2016-07-29 09:14:22 +02:00
Pranav Kant
b8ef017610 Move JWT auth to inside websocket to prevent CSRF
... instead of setting a httpOnly cookie for admin websocket
endpoint which can be CSRFed.

With this, we remove the httpOnly tag on jwt cookie so that
scripts in admin html pages can access the jwt cookie and
authenticates after opening websocket endpoint. Until
authenticated using 'auth authToken' command, admin will not
respond to any admin command.

Also, adapt admin test these changes
2016-07-29 12:03:14 +05:30
Pranav Kant
a97b4f52b8 loolwsd: Make FileServer a singleton 2016-07-28 13:54:50 +05:30
Pranav Kant
fee967e510 loolwsd: Fix indentation 2016-07-28 13:54:50 +05:30
Miklos Vajna
84ef81b7b4 LOOLWSD, Util: follow coding style when prefixing data members
Change-Id: Iaf788cc8e5b7df473a52fbe8496d500f0f63c117
2016-07-28 08:39:27 +02:00
Artyom Sovetnikov
85d275ab1a loolwsd: Remove pong frame hack
https://github.com/LibreOffice/online/pull/1
2016-07-27 23:04:25 +05:30
Ashod Nakashian
93d38f6e78 loolwsd: document new per-view notifications
Change-Id: Idfafb981e6face61c65809b24c646ceac9507992
Reviewed-on: https://gerrit.libreoffice.org/27591
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-27 16:01:10 +00:00
Ashod Nakashian
1300b412fb loolwsd: comments
Change-Id: I57ba646df6ceb24d4f101a5539c979e77130cfc9
Reviewed-on: https://gerrit.libreoffice.org/27589
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-27 16:00:54 +00:00
Ashod Nakashian
ecd33e1b07 loolwsd: send json messages to the UI as text
Change-Id: Ie5712b4ebf4f01a6650f5f7c0df5197b5b9f9208
Reviewed-on: https://gerrit.libreoffice.org/27588
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-27 16:00:25 +00:00
Ashod Nakashian
219143ceda loolwsd: unittest fixes for multiview
Three tests still fail and seem to be regressions
due to multiview. When WSD is not running with
multiview support, these tests pass.

Change-Id: Ice3224d92d10f761cb8827d35c9c0c5dd82ae308
Reviewed-on: https://gerrit.libreoffice.org/27587
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-27 15:59:29 +00:00
Ashod Nakashian
7826d85832 loolwsd: forward new notifications
Change-Id: I434545a5edb48f957d0e03c02040cc25644f67c4
Reviewed-on: https://gerrit.libreoffice.org/27586
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-27 15:59:07 +00:00
Ashod Nakashian
d56f9a0386 loolwsd: status now includes the view-ID of the client
Change-Id: Iac1cd806ac24ff3956624513946921020d248664
Reviewed-on: https://gerrit.libreoffice.org/27585
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-27 15:55:09 +00:00