web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • e40203480f Merge pull request #113 from pbondoer/staging ansuz 2017-04-24 16:09:53 +02:00
  • cc33c4abe9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-24 15:41:46 +02:00
  • a5ca461a73 update footer for new version ansuz 2017-04-24 15:41:29 +02:00
  • fdd51ec18d Don't remove a folder moved into unsorted or into itself yflory 2017-04-24 15:38:03 +02:00
  • ba407322e8 Update spanish Pierre Bondoerffer 2017-04-24 15:16:30 +02:00
  • 3e28d1b966 Add a missing key in the french translation yflory 2017-04-24 14:41:55 +02:00
  • 6cb331887e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-24 14:39:36 +02:00
  • 9abfadb32f Update french translation yflory 2017-04-24 14:39:30 +02:00
  • 4b95a1da48 unbreak assert/translations ansuz 2017-04-24 14:32:56 +02:00
  • 4fdc5f897e only feedback migration if user had legacy store ansuz 2017-04-24 14:26:55 +02:00
  • 218f2ff76c feedback when logging in or registering ansuz 2017-04-24 14:15:17 +02:00
  • 4c3e842664 Fix focus issues with the history input in ckeditor yflory 2017-04-24 13:55:03 +02:00
  • f7e96b4e8c resolve merge conflicts and jquery errors ansuz 2017-04-24 13:43:18 +02:00
  • 81c5e26a0a validate rpc messages more carefully ansuz 2017-04-24 12:10:12 +02:00
  • 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable yflory 2017-04-24 11:41:00 +02:00
  • 9e749b7cd8 handle invalid channels ansuz 2017-04-24 11:40:13 +02:00
  • 18e2e66b06 jshint compliance ansuz 2017-04-24 11:39:39 +02:00
  • 92ea03d7d9 View and restore the history of a pad yflory 2017-04-21 17:31:47 +02:00
  • 4c0d7bf8e8 support multiple calls to cryptpad.ready ansuz 2017-04-21 16:51:32 +02:00
  • ec041c88e2 console.log when providing feedback ansuz 2017-04-21 15:53:13 +02:00
  • c51073f211 support batch getFileSize calls ansuz 2017-04-21 14:51:00 +02:00
  • 1af621bfe5 Merge remote-tracking branch 'origin/auth' into staging ansuz 2017-04-20 17:27:32 +02:00
  • 3afaf029cb feedback about how often we migrate an old drive ansuz 2017-04-20 17:06:09 +02:00
  • 0e8b55edc0 Added an authentication page to allow getting the user pubkey Caleb James DeLisle 2017-04-20 10:15:07 +02:00
  • df9c312b7d make new text translateable ansuz 2017-04-18 18:31:58 +02:00
  • e8b053e48b use bootloader in feedback.html ansuz 2017-04-18 17:31:35 +02:00
  • a6dbfcecf3 remove old/unused assertions ansuz 2017-04-18 17:28:09 +02:00
  • b658bda421 use bootloader to fix paths to jquery and json.sortify ansuz 2017-04-18 17:24:46 +02:00
  • fd067510fe support logging feedback api via config.js ansuz 2017-04-18 15:51:42 +02:00
  • 8f352c8433 add justify plugin to default ckeditor config ansuz 2017-04-18 15:49:31 +02:00
  • 347459781c show the size of your files, if you're logged in ansuz 2017-04-18 15:49:04 +02:00
  • 2b8579e8b7 add pretty-printers for byte-counts ansuz 2017-04-18 15:44:15 +02:00
  • 2a25afae5f Merge branch 'soon' into staging ansuz 2017-04-18 12:24:45 +02:00
  • e0ecf651e2 add a note about showing pinned file usage ansuz 2017-04-18 12:23:58 +02:00
  • ee99310e99 Merge pull request #112 from xwiki-labs/jquery-require2 ansuz 2017-04-18 12:18:31 +02:00
  • c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter Caleb James DeLisle 2017-04-18 12:14:32 +02:00
  • da69c1822c ask users to sign back if signing keys are missing ansuz 2017-04-18 11:58:41 +02:00
  • 7a05462eb3 Some more poll changes <3 Pierre Bondoerffer 2017-04-14 19:34:58 +02:00
  • 107e75b287 remove invalid semicolon ansuz 2017-04-14 19:24:20 +02:00
  • 50793f506d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-14 18:44:20 +02:00
  • 821c1a3ec6 annotate code which we hope to be able to deprecate in the future ansuz 2017-04-14 18:44:08 +02:00
  • 853e9782e0 Merge pull request #111 from pbondoer/spanish ansuz 2017-04-14 18:43:08 +02:00
  • 43c045721c Get the channel history yflory 2017-04-14 18:36:36 +02:00
  • f6d6f81d55 send feedback when a user registers ansuz 2017-04-14 18:21:11 +02:00
  • eed5b1260d set font-size label to match other ckeditor font sizes ansuz 2017-04-14 18:20:08 +02:00
  • deeb47c40b reportAppUsage for settings ansuz 2017-04-14 18:19:04 +02:00
  • 0db603f580 spanish pinpad Pierre Bondoerffer 2017-04-14 17:59:08 +02:00
  • 05785e96ea small color change Pierre Bondoerffer 2017-04-14 17:47:05 +02:00
  • 84dd879abb add messages for settings page ansuz 2017-04-14 17:22:00 +02:00
  • 5a83759ee2 add usage button to settings page ansuz 2017-04-14 17:18:17 +02:00
  • a27cc76fc0 uppercase LOL ansuz 2017-04-14 15:35:02 +02:00
  • 402ce2db93 better validation of inputs ansuz 2017-04-14 15:34:22 +02:00
  • c7eae9675b keep exporting isArray for backwards compatibility but prevent internal use ansuz 2017-04-14 15:34:05 +02:00
  • fbebbf0dca minor clean up ansuz 2017-04-14 15:32:12 +02:00
  • 525d35c9ec redefine alert ansuz 2017-04-14 14:54:43 +02:00
  • 20c252e5c6 fix placeholder styling in safari Pierre Bondoerffer 2017-04-14 12:45:45 +02:00
  • f694a81a5c move more interface code out of cryptpad-common ansuz 2017-04-14 12:25:32 +02:00
  • a4157b9908 remove more unused functions ansuz 2017-04-14 12:14:10 +02:00
  • e10901edb2 begin to move interface code out of cryptpad-common ansuz 2017-04-14 12:09:00 +02:00
  • 95789d3cbe expose rpc for pinned usage ansuz 2017-04-14 11:41:51 +02:00
  • 8f4dbcf4c6 remove getPadTitle ansuz 2017-04-14 11:41:18 +02:00
  • f42da4ecd8 move hashChannelList into common-hash.js ansuz 2017-04-14 11:40:28 +02:00
  • 63960bd38c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-13 19:47:04 +02:00
  • 520ae822fc correct undefined reference ansuz 2017-04-13 19:46:52 +02:00
  • 50277cb0ae don't rely on 'info' in onRemote so we can call it anywhere ansuz 2017-04-13 19:46:38 +02:00
  • bf047fcf65 Merge pull request #110 from pbondoer/newpoll ansuz 2017-04-13 19:43:30 +02:00
  • 96ff487271 fix flash of content Pierre Bondoerffer 2017-04-13 19:36:04 +02:00
  • 4c7022ade9 Merge pull request #109 from pbondoer/spanish ansuz 2017-04-13 18:10:35 +02:00
  • 5a7eea08c8 Merge pull request #108 from pbondoer/newpoll ansuz 2017-04-13 18:04:13 +02:00
  • 248f88034b important fixes Pierre Bondoerffer 2017-04-13 17:56:28 +02:00
  • 65e848fd4d linter linted the lints Pierre Bondoerffer 2017-04-13 17:50:28 +02:00
  • 40c06c4515 Spanish! Pierre Bondoerffer 2017-04-13 17:42:38 +02:00
  • 633d60ccd0 Remove a TODO yflory 2017-04-13 17:19:32 +02:00
  • 3e421c7289 Fix lint errors in ckeditor config yflory 2017-04-13 17:09:35 +02:00
  • 6b57bb2bbb poll: press enter to validate input Pierre Bondoerffer 2017-04-13 17:09:31 +02:00
  • d483e10e77 poll fixes Pierre Bondoerffer 2017-04-13 17:07:09 +02:00
  • 81d83897ec Rename hash.js yflory 2017-04-13 17:04:15 +02:00
  • 2ad0a65b71 Remove shortcuts that override browser actions yflory 2017-04-13 16:42:26 +02:00
  • ea5301be13 poll improved(tm) Pierre Bondoerffer 2017-04-13 16:31:57 +02:00
  • 7434dbcb0f what i have Pierre Bondoerffer 2017-04-13 15:27:37 +02:00
  • 07705cd5c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-04-13 15:04:23 +02:00
  • eb2a3c1bbf Fix lint errors yflory 2017-04-13 15:04:17 +02:00
  • 607d9652f5 jshint compliance ansuz 2017-04-13 14:48:15 +02:00
  • 3ba90332bb Merge branch 'refactor' into staging yflory 2017-04-13 14:44:55 +02:00
  • f11cf8e6ac move poll styles to separate file Pierre Bondoerffer 2017-04-13 14:14:12 +02:00
  • daabb0b3ad Integrate and fix the new fileObject (userObject) yflory 2017-04-13 14:06:40 +02:00
  • df4a250359 use feedback api instead of app= ansuz 2017-04-13 12:18:08 +02:00
  • 86c37bfa37 fix find+replace error ansuz 2017-04-13 11:11:45 +02:00
  • e618483395 extract all code for encoding and decoding hashes ansuz 2017-04-13 11:05:28 +02:00
  • fdd2716ad5 move constants to the top of cryptpad-common.js ansuz 2017-04-13 10:31:08 +02:00
  • c1e0316d43 Refactor fileObject yflory 2017-04-12 18:54:22 +02:00
  • 5212539a16 move standalone functions from common into their own file ansuz 2017-04-12 17:54:44 +02:00
  • 7437d6b902 remove unused function ansuz 2017-04-12 17:09:42 +02:00
  • 4e590a9dd1 remove even more dead code ansuz 2017-04-12 16:16:58 +02:00
  • 85fcaa9bbc remove more dead code ansuz 2017-04-12 16:13:25 +02:00
  • 401936a91e move singly-used css file out of /common/ ansuz 2017-04-12 16:09:05 +02:00
  • 9a46b58c85 deprecate this 90 days after f-release ansuz 2017-04-12 16:03:34 +02:00
  • 7a59183bb1 pinpad.create should always be async ansuz 2017-04-12 16:02:42 +02:00
  • 8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-04-12 16:02:09 +02:00
  • 9aa0548b1f remove dead cursor code ansuz 2017-04-12 15:59:30 +02:00