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
|
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 |
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 |
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
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
2017-04-20 17:06:09 +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
|
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 |
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
2017-04-14 11:41:51 +02:00 |
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
2017-04-14 11:41:18 +02:00 |
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
2017-04-14 11:40:28 +02:00 |
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 19:47:04 +02:00 |
ansuz
|
520ae822fc
|
correct undefined reference
|
2017-04-13 19:46:52 +02:00 |
yflory
|
633d60ccd0
|
Remove a TODO
|
2017-04-13 17:19:32 +02:00 |
yflory
|
81d83897ec
|
Rename hash.js
|
2017-04-13 17:04:15 +02:00 |
ansuz
|
607d9652f5
|
jshint compliance
|
2017-04-13 14:48:15 +02:00 |
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
2017-04-13 14:44:55 +02:00 |
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
2017-04-13 14:06:40 +02:00 |
ansuz
|
df4a250359
|
use feedback api instead of app=
|
2017-04-13 12:18:08 +02:00 |
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
2017-04-13 11:05:28 +02:00 |
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
2017-04-13 10:31:08 +02:00 |
yflory
|
c1e0316d43
|
Refactor fileObject
|
2017-04-12 18:54:22 +02:00 |
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
2017-04-12 17:54:44 +02:00 |
ansuz
|
7437d6b902
|
remove unused function
|
2017-04-12 17:09:42 +02:00 |
yflory
|
cde724399c
|
Pin the pads
|
2017-04-11 14:53:44 +02:00 |
ansuz
|
2c8d1b8183
|
jshint compliance
|
2017-04-10 19:12:22 +02:00 |
ansuz
|
05a50b1f4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 17:42:43 +02:00 |
ansuz
|
a14bb1480a
|
progress for implicit pinning
|
2017-04-10 17:42:35 +02:00 |
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
2017-04-10 14:19:48 +02:00 |
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
2017-04-10 14:19:15 +02:00 |
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
2017-04-07 18:20:03 +02:00 |
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
2017-04-07 17:24:25 +02:00 |
ansuz
|
abd87e1322
|
jshint compliance
|
2017-04-07 16:33:14 +02:00 |
ansuz
|
e4b15bc616
|
implement 'getCanonicalChannelList'
|
2017-04-07 15:52:34 +02:00 |
ansuz
|
fdede0d1fd
|
remove some dead code
|
2017-04-07 12:18:03 +02:00 |
yflory
|
a8ffac5dcd
|
Remove old code
|
2017-03-27 11:30:09 +02:00 |
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
2017-03-24 12:17:49 +01:00 |
yflory
|
6fbd1f0028
|
Store the dates as number and not strings to avoid ot issues
|
2017-03-21 14:46:40 +01:00 |
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
2017-03-21 11:34:18 +01:00 |
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
ansuz
|
98027dad27
|
jshint compliance
|
2017-03-20 18:02:11 +01:00 |
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
2017-03-20 15:20:42 +01:00 |
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
2017-03-16 17:14:54 +01:00 |
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
2017-03-16 14:43:57 +01:00 |
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:53 +01:00 |
yflory
|
d19bbcb001
|
Add support for search in the drive
|
2017-03-15 18:59:55 +01:00 |
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:38 +01:00 |
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
2017-03-15 18:58:39 +01:00 |
yflory
|
b9c64a526a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 17:15:03 +01:00 |
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
2017-03-15 17:14:49 +01:00 |
ansuz
|
15a67afc75
|
jshint compliance
|
2017-03-15 16:04:52 +01:00 |
ansuz
|
7187d3c550
|
implement getUserChannelList
|
2017-03-15 15:55:55 +01:00 |
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
2017-03-14 12:49:22 +01:00 |
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
2017-03-13 11:52:39 +01:00 |
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
2017-03-08 18:05:15 +01:00 |
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
2017-03-08 16:47:38 +01:00 |
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
2017-03-06 12:20:23 +01:00 |
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
2017-03-03 18:14:53 +01:00 |
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
2017-03-02 16:38:22 +01:00 |
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
2017-03-02 16:01:34 +01:00 |
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +01:00 |
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
2017-03-02 10:15:13 +01:00 |
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
2017-03-01 21:06:53 +01:00 |
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
2017-03-01 15:07:34 +01:00 |
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
2017-03-01 13:09:14 +01:00 |
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
2017-03-01 13:08:09 +01:00 |
ansuz
|
5d39125004
|
Make onSettle Async Again
|
2017-02-28 13:12:04 +01:00 |
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
2017-02-28 11:23:50 +01:00 |
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
2017-02-28 11:05:59 +01:00 |
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
2017-02-27 20:02:54 +01:00 |
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
2017-02-27 12:06:49 +01:00 |
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
2017-02-24 18:55:41 +01:00 |
yflory
|
42b6cca18d
|
Fix new pad not working
|
2017-02-24 16:55:43 +01:00 |