yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
2017-04-28 12:16:45 +02:00 |
|
yflory
|
0ef1c14d7f
|
Fix lint errors
|
2017-04-28 12:12:17 +02:00 |
|
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 12:08:21 +02:00 |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
2017-04-28 12:08:05 +02:00 |
|
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 11:46:24 +02:00 |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
2017-04-27 18:46:46 +02:00 |
|
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-27 12:47:27 +02:00 |
|
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
2017-04-27 12:47:21 +02:00 |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
2017-04-26 18:46:40 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:42:33 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:28:48 +02:00 |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
2017-04-25 18:28:39 +02:00 |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 17:22:07 +02:00 |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
2017-04-25 17:19:13 +02:00 |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
2017-04-25 17:09:39 +02:00 |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 14:57:34 +02:00 |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
2017-04-25 14:55:38 +02:00 |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
2017-04-25 14:35:24 +02:00 |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
2017-04-25 14:33:57 +02:00 |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
2017-04-24 17:13:32 +02:00 |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
2017-04-24 15:38:03 +02:00 |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
2017-04-24 14:26:55 +02:00 |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
2017-04-24 14:15:17 +02:00 |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
2017-04-24 13:55:03 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +02:00 |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
2017-04-24 11:39:39 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
2017-04-21 16:51:32 +02:00 |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
2017-04-21 15:53:13 +02:00 |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
2017-04-21 14:51:20 +02:00 |
|
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
2017-04-20 17:06:09 +02:00 |
|
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
2017-04-18 17:31:35 +02:00 |
|
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
2017-04-18 15:49:04 +02:00 |
|
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
2017-04-18 15:44:15 +02:00 |
|
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
2017-04-18 12:24:45 +02:00 |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
2017-04-18 12:14:32 +02:00 |
|
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
2017-04-18 11:58:41 +02:00 |
|
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
2017-04-14 18:44:08 +02:00 |
|
yflory
|
43c045721c
|
Get the channel history
|
2017-04-14 18:36:36 +02:00 |
|
ansuz
|
a27cc76fc0
|
uppercase LOL
|
2017-04-14 15:35:02 +02:00 |
|
ansuz
|
402ce2db93
|
better validation of inputs
|
2017-04-14 15:34:22 +02:00 |
|
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
2017-04-14 15:34:05 +02:00 |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
2017-04-14 15:32:12 +02:00 |
|
ansuz
|
525d35c9ec
|
redefine alert
|
2017-04-14 14:54:43 +02:00 |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
2017-04-14 12:25:32 +02:00 |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
2017-04-14 12:14:10 +02:00 |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
2017-04-14 12:09:00 +02:00 |