Commit graph

4576 commits

Author SHA1 Message Date
yflory
cd7c5abc3e Fix a missing callback in closeChannel 2018-01-10 16:46:46 +01:00
ansuz
3075840e6c add more config parameters to share menu extension 2018-01-10 12:52:18 +01:00
ansuz
480ba32d78 make extension point cover share menu for files 2018-01-10 11:59:06 +01:00
ansuz
18ed463a85 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-10 11:49:23 +01:00
ansuz
1ab1f71871 implement extension point for share menu 2018-01-10 11:49:16 +01:00
yflory
d74c2a0395 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-10 11:47:59 +01:00
yflory
e5b9f089fb Fix undefined webchannel when uploading a file 2018-01-10 11:47:52 +01:00
Caleb James DeLisle
864e24b2ce Fixed typo in test 2018-01-10 11:42:48 +01:00
ansuz
65a1decd73 step towards customizable login functionality 2018-01-10 10:14:49 +01:00
ansuz
a91124e21c remove example code from todo app 2018-01-10 10:00:11 +01:00
ansuz
7ced4baf07 remove dead code from home page 2018-01-10 09:54:10 +01:00
yflory
73126ed597 Display the owner and expiration time of a pad in the properties modal 2018-01-09 18:19:24 +01:00
yflory
ecd8ef6418 improve thumbnails creation performances in code 2018-01-09 15:25:11 +01:00
yflory
77dcc1c705 Fix a race condition when switching language in the code app 2018-01-09 12:44:25 +01:00
yflory
65ccfe39ef Add a 'properties' button in pads to display pad data 2018-01-09 12:02:56 +01:00
yflory
071d385850 Remove an unnecessary websocket connection 2018-01-09 12:02:22 +01:00
ansuz
e06cb29c4f bump version 2018-01-08 18:40:51 +01:00
yflory
7defde3c59 lint compliance 2018-01-08 17:41:10 +01:00
yflory
0cea5f4596 Create an owned pad and view owned pads in the drive 2018-01-08 17:36:44 +01:00
yflory
1ec41f4e09 Ability to pick a background image in slides 2018-01-04 17:22:01 +01:00
yflory
8469119cb1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-04 10:36:11 +01:00
yflory
59c4df3d9b Fix 'NaN' txid for RPC when using IE 2018-01-03 17:14:35 +01:00
yflory
0f02d76b56 Fix missing callback when uploading files to the drive 2018-01-03 15:08:26 +01:00
ansuz
fc49b7ac87 bump bower again 2018-01-03 12:05:40 +01:00
ansuz
55b93864e5 update dependency versions 2018-01-03 12:05:27 +01:00
ansuz
63899c94f3 bump bower again 2018-01-03 11:56:58 +01:00
ansuz
33e3c6a0c0 update dependency versions 2018-01-03 11:53:14 +01:00
yflory
d2845b95b6 Fix multiple file upload prompt 2018-01-03 11:42:23 +01:00
ansuz
875035a41a Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-01-02 12:15:08 +01:00
ansuz
65e66dea08 resolve bad merge 2018-01-02 12:13:43 +01:00
ansuz
e3c7e96d71 Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek 2018-01-02 12:11:07 +01:00
ansuz
7ff02fdf03
Merge pull request #213 from Falgn0n/patch-1
Update example.nginx.conf
2018-01-02 12:09:14 +01:00
ansuz
e460d9c36c bump version 2018-01-02 10:38:49 +01:00
Falgn0n
f362aac246
Update example.nginx.conf
Updated the location block for "/api/config" to point directly to the node.js server @ localhost:3000
2017-12-24 12:13:28 +02:00
yflory
f329d65bc8 Ability to reduce the width of ckeditor 2017-12-22 18:01:15 +01:00
yflory
10aaa06781 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-22 16:25:52 +01:00
ansuz
869909b101 implement more reliable check for whether a channel on the server is new 2017-12-22 16:24:17 +01:00
ansuz
b6430d640e temporary measure to address infinite reload loop due to inaccurate inNewFile condition 2017-12-22 14:59:41 +01:00
yflory
bc5554f5f6 Display an error when visiting the bounce app without href 2017-12-22 14:58:44 +01:00
yflory
2fd22c6db6 Fix task list in markdown when using one empty line between tasks 2017-12-22 14:56:01 +01:00
yflory
5e8b183ee6 Fix uncommited column in poll hidden in published mode 2017-12-22 14:42:37 +01:00
yflory
7164d2dfdd lint compliance 2017-12-22 14:42:18 +01:00
Christos Koulaxizis
7f3a08f0c2 Greek translation 2017-12-22 14:58:51 +02:00
ansuz
26f5a1fe74 signal that onLocal is called by onRemote 2017-12-22 13:16:15 +01:00
yflory
888739e333 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:21:14 +01:00
yflory
fa6106a6bb Use CSS to remove the loading screen 2017-12-21 18:21:10 +01:00
ansuz
b0fe323a4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:09:55 +01:00
ansuz
c0b5dc7536 make loading screen tip presence configurable 2017-12-21 18:09:49 +01:00
yflory
a26031c119 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 17:38:28 +01:00
yflory
0e6e68aaff Remove print prompt in slides since the browsers already have a prompt 2017-12-21 17:38:22 +01:00