Commit graph

395 commits

Author SHA1 Message Date
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
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
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
d81d17b86c Remove old translations keys no longer used 2017-02-17 17:39:27 +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
09fade6127 add cache-busting to chainpad-crypto 2017-02-17 11:25:35 +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
e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +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
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
f723585758 add api to check whether the realtime has synced with the server 2017-02-13 10:42:17 +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
yflory
f8366e0cfc Remove support for legacy store and add a way to import legacy pads 2017-02-09 15:23:09 +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
9f1789b2d2 Fix creation of pads from non-root category in the drive 2017-02-06 14:47:37 +01:00
yflory
87abfac5e0 Fix lint error 2017-02-03 16:53:47 +01:00
yflory
b0fb56fa63 Allow logge din users to access the home page 2017-02-02 18:09:27 +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
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
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
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
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
3f1e287811 Fix an issue causing a user object to be turned into a pad 2017-01-12 11:09:45 +01:00
yflory
4278ac7637 Merge branch 'soon' into fileManager 2017-01-10 15:07:48 +01:00
ansuz
1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
yflory
1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +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
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
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
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
yflory
ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory
43ccd11adc Merge branch 'infiniteSpinner' into fileManagerMerge 2016-12-08 16:03:18 +01:00
yflory
05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
yflory
cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 2016-12-07 16:59:43 +01:00
yflory
9b3719e0ae Merge branch 'soon' into fileManagerMerge 2016-12-07 16:59:32 +01:00
yflory
90804ed9e0 Add usernames/userlist in the toolbar and fix publish button 2016-12-01 18:40:09 +01:00
yflory
5a5451d94c Sort elements in the trash, add properties in the context menu, fix issue with Edge 2016-11-23 18:21:45 +01:00
yflory
a957b72598 Create a new pad from the file manager 2016-11-21 18:49:13 +01:00
yflory
d6e1215166 Refresh the directory if needed when the object has changed 2016-11-18 17:17:48 +01:00
yflory
118829617f Use the FS store as default store 2016-11-17 18:27:55 +01:00
ansuz
c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz
303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +01:00
ansuz
2d5448458b export messages 2016-11-03 12:45:11 +01:00
ansuz
d512b113cd address failure to parse url when hash is not present 2016-11-02 18:28:19 +01: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
a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:35 +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
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
yflory
91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 2016-10-10 17:07:50 +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
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
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
3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
yflory
76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory
17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
yflory
391728ee6d Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
Yann Flory
2609af2105 Use the CodeMirror editor in the slide application 2016-09-30 17:39:16 +02:00
yflory
3d54413343 Improve the UI with FontAwesome icons 2016-09-27 18:33:03 +02:00
ansuz
d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
yflory
79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory
dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
yflory
83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz
fa8199bc75 don't try to use experimental user code 2016-09-20 16:22:00 +02:00
Yann Flory
42f14873cd Merge branch 'translations' into newhashmerge 2016-09-19 14:53:40 +02:00