Commit graph

389 commits

Author SHA1 Message Date
yflory
728272d936 Fix undefined function 2017-06-20 10:29:03 +02:00
ansuz
c0e2c1060e don't reload when slide hash changes 2017-06-15 17:54:35 +02:00
ansuz
17146d7af9 send feedback for uploads 2017-06-15 15:34:13 +02:00
yflory
66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
yflory
a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
ansuz
d25a0893cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 17:24:49 +02:00
ansuz
3184e5d235 don't reload page on hash mode change 2017-06-14 17:24:44 +02:00
yflory
1077b3b267 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 15:55:10 +02:00
ansuz
295f9c00a6 send feedback on buttons 2017-06-14 15:36:46 +02:00
yflory
497ddeee6d Upload files with drag&drop in the drive 2017-06-14 12:47:37 +02:00
yflory
f9c26645cf Upload images using the slide app 2017-06-13 16:15:04 +02:00
yflory
803bad1421 Move the file upload code in a separate file 2017-06-13 11:21:26 +02:00
yflory
7dd9ed543a Merge branch 'newDrive' into staging 2017-06-12 16:08:09 +02:00
yflory
30bdb9881c Fix undefined element in select dropdown menus 2017-06-12 14:23:06 +02:00
yflory
a5cb5f2ceb Merge branch 'staging' into newDrive 2017-06-12 10:51:38 +02:00
yflory
b36484931d Lint 2017-06-09 15:55:46 +02:00
ansuz
23318357a6 make fewer RPC calls for usageBar 2017-06-09 15:33:03 +02:00
ansuz
df586a223c update limits, usage, plan, and note whenever they are checked 2017-06-09 15:31:43 +02:00
yflory
78e6118153 Merge branch 'staging' into newDrive 2017-06-09 14:38:21 +02:00
ansuz
c4e5741ae0 update upgrade button logic 2017-06-09 12:12:39 +02:00
ansuz
f1a9002417 use upgradeURL with usage bar 2017-06-09 10:46:11 +02:00
yflory
b0fe04381d Merge branch 'staging' into newDrive 2017-06-08 18:14:31 +02:00
yflory
1c2ea04f11 Drive refactoring 2017-06-08 17:52:00 +02:00
yflory
ac91d2f413 Fix the upgrade and donate buttons in the home page 2017-06-06 11:37:54 +02:00
yflory
ee57458158 Remove the pin limit alert 2017-06-06 10:49:32 +02:00
ansuz
7b94106bac fix inverted conditional :/ 2017-05-31 18:15:31 +02:00
ansuz
2e03485db4 remove known bad entries from localStorage.userHash... 2017-05-31 18:12:58 +02:00
ansuz
936bf8df9d return falsey if userHash is junk 2017-05-31 18:08:41 +02:00
ansuz
105e5cdac9 fix 'undefined/' userHash 2017-05-31 18:01:12 +02:00
ansuz
ebfa228bc0 add upgrade button to all static pages 2017-05-30 18:39:41 +02:00
ansuz
9ca5bc507e add support for donate button 2017-05-30 15:42:53 +02:00
Caleb James DeLisle
66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 2017-05-26 18:09:31 +02:00
ansuz
fd83ae3e61 implement createRandomInteger 2017-05-24 11:34:40 +02:00
ansuz
dc80b6b11f throttle markdown preview 2017-05-24 11:27:16 +02:00
ansuz
e6c04ccb49 bump server after paying for an account 2017-05-23 16:11:07 +02:00
ansuz
6324d9bbb0 feedback on template feature usage 2017-05-23 14:54:40 +02:00
yflory
c3437382fb Fix the release version in the what's new popup 2017-05-23 11:22:32 +02:00
yflory
d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
ansuz
ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
yflory
d014fccfce Fix lint error 2017-05-18 18:52:14 +02:00
yflory
2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 18:51:21 +02:00
yflory
814c81fb13 Display an alert when CryptPad has a new version 2017-05-18 18:51:08 +02:00
ansuz
164342920e fix inverted condition 2017-05-18 15:39:24 +02:00
ansuz
7befaccd88 move more rpc calls into pinpad 2017-05-18 12:36:12 +02:00
yflory
fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 14:41:51 +02:00
yflory
953e7155f0 Send only the hostname to the accounts server 2017-05-16 14:41:40 +02:00
ansuz
afef456b18 fix undefined reference 2017-05-16 14:15:42 +02:00
yflory
87fa28180a Display an upgrade button in the settings page 2017-05-16 10:34:50 +02:00
yflory
c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:21:25 +02:00
ansuz
1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:17:56 +02:00
yflory
dc2cdb7c08 Add the usage bar in the settings page 2017-05-15 18:16:22 +02:00
ansuz
2dd04f7631 get limits from the server 2017-05-15 18:03:12 +02:00
yflory
771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 13:54:25 +02:00
yflory
57979f6314 Display the public key using a href in the settings page 2017-05-15 13:53:43 +02:00
ansuz
06f3d0eefe shim isArray if not exists. correctly report how often this occurs 2017-05-15 10:26:52 +02:00
yflory
601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
yflory
ed95bbb08f Fix lint errors 2017-05-12 16:43:01 +02:00
yflory
89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-12 16:33:56 +02:00
yflory
0f13198119 Move the parseHash code into parsePadUrl 2017-05-12 16:33:45 +02:00
yflory
57ee7de7d4 Update and return the storage limit 2017-05-11 16:12:44 +02:00
yflory
5c8586f8a3 Fix typo in file upload 2017-05-10 15:00:05 +02:00
ansuz
a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-09 18:36:27 +02:00
ansuz
df47b913e3 fetch array buffers in cryptpad-common 2017-05-09 18:36:18 +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
bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:57:05 +02:00
yflory
6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +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
78b11584f8 remove unused variables 2017-05-04 16:16:09 +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
yflory
afb0061d7b Fix an issue with anonymous user unable to store new pads 2017-04-28 17:11:07 +02:00
yflory
a51a35da70 Fix an issue with hashes ending with a slash 2017-04-28 15:47:31 +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
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