Commit graph

1023 commits

Author SHA1 Message Date
ansuz
d512b113cd address failure to parse url when hash is not present 2016-11-02 18:28:19 +01:00
ansuz
6ae851ffdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon 2016-11-02 13:01:40 +01:00
ansuz
0b7ed69ec5 Merge branch 'staging' into staging-soon 2016-11-02 12:10:05 +01:00
ansuz
636b0fcadc do our best to keep the console quiet 2016-11-02 12:09:41 +01:00
yflory
3de4e5709b Clean the code 2016-10-26 17:50:59 +02:00
yflory
ab1d3958ce Add a pencil icon when hovering the title 2016-10-26 17:49:16 +02:00
yflory
64346b72d8 Change the height of the toolbar top line 2016-10-26 15:14:54 +02:00
yflory
6d1e06cca3 Add notifications when a user joins or leaves the channel 2016-10-26 15:02:30 +02:00
yflory
54a63267cd Add a share button and merge the viewers and editors buttons 2016-10-25 18:34:23 +02:00
yflory
87d86384ac Fix broken elements in the new toolbar 2016-10-25 17:29:13 +02:00
yflory
6351d1856f Remove the top bar and move its content in the applications' toolbars 2016-10-25 15:22:35 +02:00
yflory
3d74290c7d Merge branch 'usability5' into staging 2016-10-24 18:33:10 +02:00
yflory
9e92a597b3 Ability to edit the title in the toolbar by clicking it 2016-10-24 18:32:43 +02:00
ansuz
0a9d34a6c9 hide appended color pickers 2016-10-24 15:30:23 +02:00
ansuz
5dbd16a956 hide appended color pickers 2016-10-24 15:29:46 +02:00
ansuz
c858b247c1 filter absent users from the userlist 2016-10-24 15:11:19 +02:00
ansuz
ac3ddbab70 expose userList for later usage 2016-10-24 15:10:49 +02:00
ansuz
a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:35 +02:00
ansuz
901a708be6 Merge branch 'usability1' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:06 +02:00
ansuz
2326526f95 correct grammatical error in French translation 2016-10-24 14:32:34 +02:00
Yann Flory
10bb5e1607 Add the title in the toolbar 2016-10-21 18:16:27 +02:00
Yann Flory
1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad 2016-10-21 15:17:15 +02:00
ansuz
5d9b81ab2f Merge pull request #53 from xwiki-labs/update
minor fixes to html and userlist
2016-10-20 11:54:29 +02:00
ansuz
e23ac85b6d use absolute path to css 2016-10-20 11:30:36 +02:00
ansuz
78f8286fe3 add a note about installing storage adaptors from npm 2016-10-20 11:29:26 +02:00
ansuz
46c5f64369 remove absent users from the userlist 2016-10-19 12:30:25 +02:00
ansuz
a98f8944d6 Merge pull request #52 from xwiki-labs/fixTranslations
Fix translations
2016-10-18 14:07:21 +02:00
yflory
51a79c5218 Remove unused dependency 2016-10-18 13:38:48 +02:00
yflory
f5fbebfcc9 Fix small issues with the french translation 2016-10-18 13:37:51 +02:00
ansuz
8eea58ecdd Merge pull request #51 from xwiki-labs/config-http-headers
Config http headers
2016-10-18 11:54:54 +02:00
ansuz
2f9283a677 fix leaky global variable 2016-10-18 11:51:35 +02:00
ansuz
a2e5c96115 make http headers configurable, update default conf 2016-10-18 11:48:29 +02:00
yflory
9a733bb360 Fix dropdown menus with Edge 2016-10-13 15:00:53 +02:00
yflory
4378df25b8 Merge branch 'css' into soon 2016-10-13 14:26:43 +02:00
yflory
39bbf8a6c1 Fix the new userlist button and make the toolbar responsive 2016-10-13 14:24:59 +02:00
yflory
24fbe22c9d Improve the toolbar style and the way the userlist is displayed 2016-10-12 18:40:26 +02:00
ansuz
0fe62f8c75 make wss CSP headers configurable again 2016-10-12 13:03:36 +02:00
ansuz
40bac1df55 Merge branch 'sandbox-frame' of https://github.com/cjdelisle/cryptpad into csp 2016-10-12 11:55:51 +02:00
ansuz
1f2e45d6c8 improved fs storage adaptor and config docs
* regularly close open file descriptors older than channelExpirationMs
* clean up older file descriptors when exceeding openFileLimit
2016-10-12 10:52:27 +02:00
ansuz
22464af6a5 fix reference to incorrect config flag 2016-10-12 10:39:46 +02:00
yflory
d2389a5729 Change the userlist in the toolbar 2016-10-11 18:39:43 +02:00
yflory
e739c49e7f Remove the 'about' button in ckeditor 2016-10-11 11:57:07 +02:00
yflory
b23fe783e3 Fix the color picker in Chrome and hide the buttons when not supported 2016-10-10 18:21:18 +02:00
yflory
91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 2016-10-10 17:07:50 +02:00
yflory
53fe002d3b Merge branch 'slide' into soon 2016-10-10 17:06:39 +02:00
yflory
6c04b7967d Remove unused library 2016-10-10 17:03:25 +02:00
yflory
d63c912af0 Use the HTML5 color picker to change the colors in slides 2016-10-10 17:01:04 +02:00
ansuz
bb2317d8e6 fix chrome style bug by forcing reload of style sheet 2016-10-07 17:41:52 +02:00
yflory
765498e88e Remove the support for old.cryptpad.fr 2016-10-07 10:39:48 +02:00
yflory
d7e170c797 Test colorpicker 2016-10-07 10:31:36 +02:00