ansuz
|
5c53f172a1
|
Merge pull request #55 from xwiki-labs/soon
Merge 'soon' into master
|
2016-10-28 18:02:09 +02:00 |
|
ansuz
|
5dbd16a956
|
hide appended color pickers
|
2016-10-24 15:29:46 +02:00 |
|
ansuz
|
2326526f95
|
correct grammatical error in French translation
|
2016-10-24 14:32:34 +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 |
|
Caleb James DeLisle
|
72fc2e7068
|
Chuck a few more super-duper-security headers in there
|
2016-10-06 23:02:30 +02:00 |
|
Caleb James DeLisle
|
f8ac3a6ad3
|
Fix merge error
|
2016-10-06 22:48:30 +02:00 |
|
Caleb James DeLisle
|
83c3f6310a
|
Don't make the codestyle any worse than it is
|
2016-10-06 22:44:58 +02:00 |
|
Caleb James DeLisle
|
12cdd1e76b
|
Add a Content Security Policy which works for CryptPad
|
2016-10-06 22:37:25 +02:00 |
|
Yann Flory
|
81fce1237f
|
Colorpicker to choose the background color in present mode
|
2016-10-06 18:04:35 +02:00 |
|
yflory
|
5300bc363c
|
Fix a race condition in the slide application
|
2016-10-05 18:26:32 +02:00 |
|
yflory
|
c322aa440e
|
Fix the username icon hcih was not working anymore
|
2016-10-05 18:19:52 +02:00 |
|
yflory
|
8575f3f79f
|
Fix the "rename" feature which was not working anymore in some cases
|
2016-10-05 17:22:56 +02:00 |
|
yflory
|
a989b51d74
|
Fix race conditions with Alertify
|
2016-10-05 16:04:21 +02:00 |
|
yflory
|
74df38f94f
|
Fix race conditions that could prevent applications from being loaded
|
2016-10-05 11:19:18 +02:00 |
|
ansuz
|
7d5a33512a
|
enable slide application listing on home page by default
|
2016-10-04 17:15:09 +02:00 |
|
ansuz
|
a28daf2715
|
use websocket url configuration api
|
2016-10-04 17:13:15 +02:00 |
|
ansuz
|
dbc8f01b8b
|
fix merge errors and reach full jshint compliance
|
2016-10-04 16:58:10 +02:00 |
|
yflory
|
a30e17121d
|
Merge branch 'readonlyButton' into soon
|
2016-10-04 15:48:52 +02:00 |
|
yflory
|
e84a54556c
|
Move the toolbar buttons' events handlers in cryptpad-common
|
2016-10-04 15:44:12 +02:00 |
|
ansuz
|
2ac1b02572
|
Merge branch 'config-sockets' into soon
|
2016-10-04 14:38:50 +02:00 |
|
ansuz
|
61dfca33a3
|
resolve conflict and merge 'newserver'
|
2016-10-04 12:43:14 +02:00 |
|
ansuz
|
ee88e96baf
|
merge noscript
|
2016-10-04 11:42:06 +02:00 |
|
ansuz
|
11f63c861c
|
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
|
2016-10-04 11:23:04 +02:00 |
|