yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 17:48:07 +02:00 |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
2017-05-09 17:47:47 +02:00 |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
2017-05-09 14:32:41 +02:00 |
|
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
2017-05-09 14:31:28 +02:00 |
|
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
2017-05-05 18:25:55 +02:00 |
|
yflory
|
9206d89531
|
Fix lint errors
|
2017-05-05 17:58:32 +02:00 |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:57:05 +02:00 |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
2017-05-05 17:56:49 +02:00 |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
2017-05-05 15:47:46 +02:00 |
|
ansuz
|
3a338e0890
|
fix undefined reference
|
2017-05-05 15:20:41 +02:00 |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
2017-05-05 15:09:07 +02:00 |
|
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
2017-05-05 11:55:19 +02:00 |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
2017-05-05 09:10:31 +02:00 |
|
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
2017-05-04 18:24:58 +02:00 |
|
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 17:14:30 +02:00 |
|
yflory
|
1b6fae4dd2
|
Update mediatag
|
2017-05-04 17:14:24 +02:00 |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
2017-05-04 16:37:25 +02:00 |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:16:16 +02:00 |
|
ansuz
|
78b11584f8
|
remove unused variables
|
2017-05-04 16:16:09 +02:00 |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:08:21 +02:00 |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
2017-05-04 16:08:12 +02:00 |
|
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
2017-05-04 11:36:24 +02:00 |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
2017-05-04 11:20:52 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
ansuz
|
f2672d587a
|
fix variable redefinition
|
2017-05-02 09:42:51 +02:00 |
|
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-29 14:24:14 +02:00 |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
2017-04-28 18:23:41 +02:00 |
|
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 17:13:18 +02:00 |
|
ansuz
|
28e4ef1b13
|
WIP RPC code
|
2017-04-28 17:11:50 +02:00 |
|
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
2017-04-28 17:11:07 +02:00 |
|
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
2017-04-28 17:03:47 +02:00 |
|
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
2017-04-28 16:09:46 +02:00 |
|
ansuz
|
1b3ce5aa96
|
fix typo
|
2017-04-28 16:08:47 +02:00 |
|
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
2017-04-28 15:47:31 +02:00 |
|
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
2017-04-28 14:09:59 +02:00 |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
2017-04-28 13:06:55 +02:00 |
|
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 |
|
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 |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 15:04:23 +02:00 |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
2017-04-13 15:04:17 +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
|
86c37bfa37
|
fix find+replace error
|
2017-04-13 11:11:45 +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 |
|
ansuz
|
4e590a9dd1
|
remove even more dead code
|
2017-04-12 16:16:58 +02:00 |
|
ansuz
|
85fcaa9bbc
|
remove more dead code
|
2017-04-12 16:13:25 +02:00 |
|
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
2017-04-12 16:09:05 +02:00 |
|
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
2017-04-12 16:02:42 +02:00 |
|
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-12 16:02:09 +02:00 |
|
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
2017-04-12 15:59:30 +02:00 |
|
yflory
|
4e61b79f9a
|
Clean fileObject
|
2017-04-11 15:11:33 +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 |
|
ansuz
|
f82278a25c
|
handle return of undefined hash
|
2017-04-10 17:38:25 +02:00 |
|
ansuz
|
1d933be5a6
|
make reset return the hash, not an array with containing it
|
2017-04-10 15:57:38 +02:00 |
|
yflory
|
f34492be94
|
Remove duplicates uid in the user list
|
2017-04-10 15:27:01 +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
|
a70388284d
|
disable unnecessary messages
|
2017-04-07 17:21:04 +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
|
a2f692b9a3
|
clean up serverside and clientside pinning logic
|
2017-04-07 15:20:30 +02:00 |
|
ansuz
|
fdede0d1fd
|
remove some dead code
|
2017-04-07 12:18:03 +02:00 |
|
ansuz
|
e87992c7ec
|
implement atomic pin reset rpc
|
2017-04-07 11:37:19 +02:00 |
|
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
2017-04-07 10:09:59 +02:00 |
|
ansuz
|
5c292fb1fa
|
jshint compliance
|
2017-04-06 08:32:31 +02:00 |
|
ansuz
|
64089c5f6b
|
implement pad pinning
|
2017-04-05 17:28:04 +02:00 |
|
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 15:00:10 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:24:17 +02:00 |
|
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
2017-04-05 12:24:01 +02:00 |
|
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:04:18 +02:00 |
|
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
2017-04-05 12:04:01 +02:00 |
|
ansuz
|
3e47b8a38d
|
remove dead code
|
2017-04-05 10:42:24 +02:00 |
|
ansuz
|
182dbfc874
|
implement pinning logic in pinpad.js
|
2017-04-04 12:13:31 +02:00 |
|
ansuz
|
a5e5ddae08
|
rpc all the things
|
2017-04-03 19:24:57 +02:00 |
|
ansuz
|
04069cc7f4
|
fix font size
|
2017-03-31 13:28:30 +02:00 |
|
ansuz
|
6e9968f989
|
add 'lol' code theme
|
2017-03-31 09:19:45 +02:00 |
|
ansuz
|
9b4b642d4a
|
protect against subtly corrupted user objects
|
2017-03-30 17:19:49 +02:00 |
|
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
2017-03-29 16:02:04 +02:00 |
|
ansuz
|
3cfd0a4326
|
commit some garbage
|
2017-03-29 15:40:34 +02:00 |
|
ansuz
|
ed89a13fe6
|
progress on adding version string to some css
|
2017-03-29 12:55:36 +02:00 |
|
ansuz
|
76990ac1b2
|
version toolbar.css for cache-busting
|
2017-03-29 11:56:03 +02:00 |
|
ansuz
|
a0c17d7c9b
|
latest rpc code
|
2017-03-27 18:15:15 +02:00 |
|
ansuz
|
59a80d5fde
|
remove silly TODO
|
2017-03-27 12:08:19 +02:00 |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
2017-03-27 11:30:09 +02:00 |
|
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
2017-03-24 13:17:51 +01:00 |
|
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
2017-03-24 12:17:49 +01:00 |
|
yflory
|
994d640f8b
|
Fix an issue causing the lag icon to lose its color
|
2017-03-21 14:52: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
|
51033ab70a
|
Remove useless links in the context menu and properties for readonly pads in the drive
|
2017-03-21 12:09:07 +01:00 |
|
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
2017-03-21 11:34:18 +01:00 |
|
ansuz
|
b542245086
|
fix lint error
|
2017-03-20 18:11:26 +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 |
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
2017-03-20 17:51:56 +01:00 |
|
yflory
|
29174b2922
|
Update the lag icon
|
2017-03-20 16:39:33 +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
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:47:03 +01:00 |
|
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
2017-03-16 14:46:17 +01:00 |
|
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
2017-03-16 14:45:38 +01:00 |
|
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
2017-03-16 14:43:57 +01:00 |
|
yflory
|
7761aaa89f
|
Add search UI
|
2017-03-16 14:16:42 +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 |
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
2017-03-15 18:57:13 +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
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 16:05:05 +01:00 |
|
ansuz
|
15a67afc75
|
jshint compliance
|
2017-03-15 16:04:52 +01:00 |
|
yflory
|
13d7b3cadc
|
Merge branch 'd' into staging
|
2017-03-15 16:01:29 +01:00 |
|
ansuz
|
7187d3c550
|
implement getUserChannelList
|
2017-03-15 15:55:55 +01:00 |
|
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
2017-03-14 15:52:04 +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
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
2017-03-14 12:09:52 +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 |
|
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
2017-03-13 18:49:30 +01:00 |
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:17 +01:00 |
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
2017-03-13 11:52:39 +01:00 |
|
ansuz
|
d9996cc874
|
current work for pinning
|
2017-03-13 10:56:08 +01:00 |
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
2017-03-10 18:03:52 +01:00 |
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 10:49:33 +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
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
2017-03-08 15:49:02 +01:00 |
|
yflory
|
b701e3cc85
|
Fix lint errors
|
2017-03-08 14:59:51 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
2017-03-07 18:39:21 +01:00 |
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
2017-03-07 17:33:31 +01:00 |
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
2017-03-07 17:30:32 +01:00 |
|
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
2017-03-07 14:30:07 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
2017-03-06 14:56:41 +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 |
|
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
2017-03-03 12:48:00 +01:00 |
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 17:59:35 +01:00 |
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
|
yflory
|
52793385ea
|
Fix lint errors
|
2017-03-02 17:17:55 +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
|
5797aab3f2
|
Fix XSS with display names in the user list
|
2017-03-01 13:08:36 +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 |
|
yflory
|
498f4065cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:29:55 +01:00 |
|
yflory
|
66dc166936
|
Make sure the realtime is synced with onSettle when using cryptget
|
2017-02-27 14:28:12 +01:00 |
|
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
2017-02-27 12:06:49 +01:00 |
|
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 18:55:48 +01:00 |
|
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
2017-02-24 18:55:41 +01:00 |
|
ansuz
|
cc829d51f8
|
jshint compliance
|
2017-02-24 18:23:43 +01:00 |
|
yflory
|
42b6cca18d
|
Fix new pad not working
|
2017-02-24 16:55:43 +01:00 |
|
yflory
|
3fd5669647
|
Hide the trash icon for read-only pads if we have the edit link in drive
|
2017-02-24 16:51:15 +01:00 |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
2017-02-24 15:22:26 +01:00 |
|
yflory
|
54b0a86c2e
|
Make sure we redirect to the drive if we access the login page from the homepage
|
2017-02-24 11:44:47 +01:00 |
|
yflory
|
ba0b314f5e
|
Fix the 'new' button in drive which was broken in non root categories
|
2017-02-23 18:15:44 +01:00 |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
2017-02-22 12:25:29 +01:00 |
|
ansuz
|
7e77c6828a
|
more correct pluralization
|
2017-02-21 18:55:48 +01:00 |
|
yflory
|
c72bbd4c37
|
Use the file name as initial title
|
2017-02-21 17:42:58 +01:00 |
|
yflory
|
47b8fefd9e
|
Load messages.js only once, in cryptpad-common
|
2017-02-21 14:16:23 +01:00 |
|
yflory
|
11d9c9e813
|
Merge branch 'master' into staging
|
2017-02-21 10:44:03 +01:00 |
|
yflory
|
2103f0afa8
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-02-21 10:42:35 +01:00 |
|
yflory
|
0bdf59c1dd
|
Fix broken link in the 'New' button on cryptpad.fr
|
2017-02-21 10:42:06 +01:00 |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
2017-02-17 17:39:27 +01:00 |
|
yflory
|
239e2bcc1f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
2017-02-17 15:18:09 +01:00 |
|
yflory
|
1540ae3f6f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
2017-02-17 15:16:30 +01:00 |
|
ansuz
|
94417d9a8b
|
jshint compliance
|
2017-02-17 14:28:18 +01:00 |
|
ansuz
|
c9b8889380
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:26:43 +01:00 |
|
ansuz
|
09fade6127
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:25:35 +01:00 |
|
yflory
|
2daa9f8658
|
Link to main page was opened in the inner iframe
|
2017-02-17 10:57:56 +01:00 |
|
yflory
|
deda40375a
|
Use the new onSettle from chainpad to determine if the realtime is synced
|
2017-02-17 10:31:07 +01:00 |
|
yflory
|
92d50ded64
|
Merge branch 'soon' into staging
|
2017-02-16 16:48:12 +01:00 |
|
yflory
|
97762f9f9a
|
Make sure all the elements in RECENTPADS are non-null objects
|
2017-02-16 16:07:43 +01:00 |
|
yflory
|
e4dbe97d71
|
Update display name in realtime across tabs and remember 'anonymous' name
|
2017-02-16 15:35:03 +01:00 |
|
yflory
|
7762ffcbff
|
Ability to use Ctrl+click on the cryptpad logo in apps
|
2017-02-15 18:31:36 +01:00 |
|
yflory
|
7497e0d1c5
|
Add a dropdown user menu to the top bar in static pages
|
2017-02-15 17:57:42 +01:00 |
|
yflory
|
7758d056fa
|
Ability to import/export a user realtime object
|
2017-02-15 12:40:28 +01:00 |
|
yflory
|
cd9cea8fa4
|
Create a settings app to manage user objects
|
2017-02-14 19:04:57 +01:00 |
|
yflory
|
71b84afdb2
|
Redirect to the pad when logging in or signing up from a pad
|
2017-02-14 11:29:08 +01:00 |
|
yflory
|
92050eb04f
|
Fix the trash button in toolbar not always working
|
2017-02-14 10:56:38 +01:00 |
|
yflory
|
aae3fba284
|
Fix the storage when the hash is invalid
|
2017-02-13 17:54:01 +01:00 |
|
yflory
|
b1b294aade
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 11:10:40 +01:00 |
|
yflory
|
3aa03225c9
|
Add a spinner when hashing the password and translate homepage
|
2017-02-13 11:09:30 +01:00 |
|
ansuz
|
fbcf4ccec4
|
force usernames to be lowercase
|
2017-02-13 11:01:30 +01:00 |
|
ansuz
|
5614bea271
|
redirect users to login and register from toolbar
|
2017-02-13 10:51:54 +01:00 |
|
ansuz
|
f723585758
|
add api to check whether the realtime has synced with the server
|
2017-02-13 10:42:17 +01:00 |
|
ansuz
|
d0edf75c89
|
signup link directs users to register page, not user
|
2017-02-10 16:48:28 +01:00 |
|
ansuz
|
1232aa8a79
|
jshint compliance
|
2017-02-10 14:25:02 +01:00 |
|
yflory
|
8eec7ec7c8
|
Fix typo
|
2017-02-10 11:00:34 +01:00 |
|
ansuz
|
f92ba193c3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-09 17:16:03 +01:00 |
|
ansuz
|
e100110741
|
implement log in as an api
|
2017-02-09 16:31:57 +01:00 |
|
yflory
|
f8366e0cfc
|
Remove support for legacy store and add a way to import legacy pads
|
2017-02-09 15:23:09 +01:00 |
|
yflory
|
67d881b2cf
|
Remove the drive entry from the user menu if already in drive
|
2017-02-08 16:25:52 +01:00 |
|
yflory
|
914c442615
|
Do not redirect to home page when logging out from another tab
|
2017-02-08 12:54:07 +01:00 |
|
yflory
|
702798f65a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 18:47:24 +01:00 |
|
yflory
|
1e2cc6bea4
|
Fix race condition with the iframe store
|
2017-02-07 18:47:10 +01:00 |
|
ansuz
|
6e97082ff9
|
remove dead code from login function
|
2017-02-07 17:27:36 +01:00 |
|
ansuz
|
8a1acc3c37
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 10:40:03 +01:00 |
|
ansuz
|
6f07a3b7b4
|
erase lingering sessionStorage values when logging out
|
2017-02-07 10:39:42 +01:00 |
|
yflory
|
ac79fbb5a2
|
Improve mobile support for the toolbar and the drive
|
2017-02-06 18:06:59 +01:00 |
|
yflory
|
9f1789b2d2
|
Fix creation of pads from non-root category in the drive
|
2017-02-06 14:47:37 +01:00 |
|
yflory
|
ad82a275bc
|
Replace the Apps button by a New button again
|
2017-02-06 11:39:04 +01:00 |
|
yflory
|
fd33ffd56f
|
Fix issue creating a patch everytime the user clicked in an app
|
2017-02-06 11:12:08 +01:00 |
|
yflory
|
87abfac5e0
|
Fix lint error
|
2017-02-03 16:53:47 +01:00 |
|
yflory
|
02439e0f61
|
Improve the homepage with new images and translations
|
2017-02-03 16:03:36 +01:00 |
|
yflory
|
2c6b4b9c6a
|
Hide disabled applications from the context menu in drive
|
2017-02-02 18:40:39 +01:00 |
|
yflory
|
91299f5f30
|
Ability to access the drive from any pad
|
2017-02-02 18:22:59 +01:00 |
|
yflory
|
b0fb56fa63
|
Allow logge din users to access the home page
|
2017-02-02 18:09:27 +01:00 |
|
yflory
|
65054119cf
|
Fix a bug preventing reconnection in drive
|
2017-02-01 17:21:54 +01:00 |
|
yflory
|
757ae7a3ad
|
Fix a cross origin frame issue with dropdowns
|
2017-02-01 12:19:54 +01:00 |
|
yflory
|
39c85ca3f7
|
Fix race condition causing missing translations in homepage
|
2017-01-31 12:01:33 +01:00 |
|
yflory
|
5e69b78334
|
Remove the domain from the href in store
|
2017-01-30 18:52:27 +01:00 |
|
yflory
|
58d8a30b5b
|
Redirect to the main page when logging out
|
2017-01-30 15:26:32 +01:00 |
|
yflory
|
5ef074370b
|
Name a place before creating it in the drive
|
2017-01-27 17:51:08 +01:00 |
|
yflory
|
0e9e0e545f
|
Load the new pad when the hash is changed
|
2017-01-27 14:57:45 +01:00 |
|
yflory
|
e41cbb92d8
|
Use default FILES_DATA name if not provided
|
2017-01-26 16:52:23 +01:00 |
|
yflory
|
c44f3a1044
|
Delete multiple elements could also remove unselected ones
|
2017-01-26 16:18:43 +01:00 |
|
yflory
|
3f44444f41
|
Display the 'New' button in the trash
|
2017-01-26 13:19:40 +01:00 |
|
yflory
|
11f0a9ae5f
|
Revert the changes adding anonymous pads
|
2017-01-25 15:35:40 +01:00 |
|
yflory
|
f42665ba49
|
Remove the unowned pads category
|
2017-01-25 14:27:06 +01:00 |
|
yflory
|
cb85ad3fdf
|
Merge branch 'newtoolbar' into ownedpads
|
2017-01-25 10:23:03 +01:00 |
|
yflory
|
373b07ed28
|
Fix lint errors
|
2017-01-25 10:21:31 +01:00 |
|
yflory
|
015e6fc262
|
Make sure we have the same hash in all the tabs when disconnecting
|
2017-01-24 18:17:23 +01:00 |
|
yflory
|
88021f2264
|
Anonymous pads fo anonymous users
|
2017-01-24 18:14:29 +01:00 |
|
yflory
|
9d275daebb
|
Backport changes for the login page from hpbs branch
|
2017-01-24 12:47:53 +01:00 |
|
yflory
|
99b8898e54
|
Apply new title when clicking on the page without pressing enter
|
2017-01-19 15:41:25 +01:00 |
|
yflory
|
88d5b4cc9c
|
Add a 'New pad' button in the toolbar
|
2017-01-18 11:00:46 +01:00 |
|
yflory
|
a9063e0459
|
Reload all tabs when the user logs in or out
|
2017-01-16 14:08:44 +01:00 |
|
yflory
|
efed1f5efe
|
Add handlers to login and logout buttons
|
2017-01-13 17:39:41 +01:00 |
|
yflory
|
767ba8b549
|
Select what we want to display in the toolbar
|
2017-01-13 17:14:44 +01:00 |
|
yflory
|
2afdc11327
|
Replace the username button by a dropdown menu
|
2017-01-13 17:11:12 +01:00 |
|
yflory
|
4adde0f0c0
|
Use the new dropdown for userlist and share
|
2017-01-13 15:05:00 +01:00 |
|
yflory
|
efffd4974f
|
Add createDropdown and createLanguageSelector in cryptpad-common
|
2017-01-12 18:28:38 +01:00 |
|
yflory
|
29c8f0bbef
|
Use a FontAwesome spinner to replace the old unaligned one
|
2017-01-12 17:05:16 +01:00 |
|
yflory
|
3f1e287811
|
Fix an issue causing a user object to be turned into a pad
|
2017-01-12 11:09:45 +01:00 |
|
yflory
|
569ea21705
|
Replace the language selector by our custom dropdown menu
|
2017-01-11 10:59:09 +01:00 |
|
yflory
|
26dd4ea11f
|
Fix lint errors
|
2017-01-10 15:33:21 +01:00 |
|
yflory
|
4278ac7637
|
Merge branch 'soon' into fileManager
|
2017-01-10 15:07:48 +01:00 |
|
yflory
|
2be5db9540
|
Ability to open files in readonly mode
Fix CSS issues
|
2017-01-10 15:04:02 +01:00 |
|
yflory
|
f74d0a46a4
|
Remove the alert when pressing del in 'all files'
|
2017-01-09 18:38:05 +01:00 |
|
ansuz
|
1c3f1a15cd
|
make sure that /pad is resized after loading
|
2017-01-09 17:02:01 +01:00 |
|
yflory
|
5b08fed7fa
|
Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
|
2017-01-09 16:29:16 +01:00 |
|
yflory
|
d5561910d4
|
Move the file manager into /drive and add a toolbar
|
2017-01-06 18:26:41 +01:00 |
|
yflory
|
1e70af0c16
|
Use the same network for the apps and the file store
|
2017-01-06 13:52:53 +01:00 |
|
ansuz
|
e56cc49f79
|
catch errors that popped up because of a cross-origin iframe
|
2017-01-05 14:14:26 +01:00 |
|
ansuz
|
5cd714b18a
|
configure filestore usage via customize/application_config.js
|
2017-01-03 12:10:11 +01:00 |
|
ansuz
|
91a806ab86
|
focus on OK button when we pop an alert
|
2016-12-29 17:10:59 +01:00 |
|
ansuz
|
89e5830409
|
make alertify display time configurable
|
2016-12-28 17:13:00 +01:00 |
|
ansuz
|
5e1d8292c5
|
guard against trying to parse special fragments
|
2016-12-26 14:23:17 +01:00 |
|
ansuz
|
52a593c2c2
|
fix jshint complaints
|
2016-12-22 17:27:56 +01:00 |
|
ansuz
|
53a4d4738a
|
really make sure you're logged out
|
2016-12-22 17:22:32 +01:00 |
|
ansuz
|
5534da8abf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
2016-12-22 16:54:51 +01:00 |
|
yflory
|
9b6c9e3891
|
Add support for templates in the file manager
|
2016-12-22 16:53:38 +01:00 |
|
ansuz
|
29d406b7a9
|
implement cryptput
|
2016-12-22 16:00:13 +01:00 |
|
yflory
|
87abfff66b
|
Fix Flash Of Unstyled Content (fouc)
|
2016-12-21 18:33:21 +01:00 |
|
ansuz
|
1682d23c1c
|
remove old user prototype
|
2016-12-21 18:06:05 +01:00 |
|
yflory
|
c359c27997
|
Use user object as default store in file manager
|
2016-12-20 17:27:45 +01:00 |
|
yflory
|
4aed585574
|
Fix style issues in the toolbar
|
2016-12-20 14:40:00 +01:00 |
|
ansuz
|
bd6992da0a
|
create a random hash
|
2016-12-20 11:13:15 +01:00 |
|
ansuz
|
2cd50498c2
|
add log(in|out) functions to common
|
2016-12-20 11:11:40 +01:00 |
|
ansuz
|
7df460c766
|
implement createChannelId api
|
2016-12-19 14:55:39 +01:00 |
|
ansuz
|
5a14db9f07
|
Merge branch 'test-filemanager' into login
|
2016-12-19 12:37:28 +01:00 |
|
ansuz
|
303953a431
|
Merge branch 'soon' into login
|
2016-12-19 11:04:46 +01:00 |
|
ansuz
|
6b9529b121
|
implement ajax-like functionality for zk docs
|
2016-12-19 10:59:18 +01:00 |
|
yflory
|
5bc7766f44
|
Use a consistent toolbar across all apps
|
2016-12-16 18:35:49 +01:00 |
|
ansuz
|
2968488278
|
convert uint8 arrays to hex
|
2016-12-16 15:18:06 +01:00 |
|
yflory
|
8e6830d080
|
Fix file manager with a chosen hash
|
2016-12-12 18:24:45 +01:00 |
|