Commit Graph

2444 Commits (a5ffd278a770ac78a464960c187c1ee7980d2ed8)

Author SHA1 Message Date
ansuz a5ffd278a7 write styles for code in .less 2017-05-24 17:27:03 +02:00
ansuz 3803f6a20f only render preview if preview container is visible 2017-05-24 17:25:33 +02:00
ansuz 617e027f12 catch markdown preview errors 2017-05-24 15:50:35 +02:00
ansuz bc26f7fc4e Merge branch 'soon' into staging 2017-05-24 15:04:40 +02:00
Caleb James DeLisle 70c1061f47 Fix romanian translation 2017-05-24 14:49:00 +02:00
Caleb James DeLisle 83c0a6d37d Romanian translation 2017-05-24 14:37:13 +02:00
ansuz c5bb830757 don't preview if hightlight mode is not markdown 2017-05-24 14:21:31 +02:00
ansuz fd83ae3e61 implement createRandomInteger 2017-05-24 11:34:40 +02:00
ansuz 4d9060f49e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-24 11:28:06 +02:00
ansuz 378bf2aa94 yflory's word wrap fix 2017-05-24 11:27:31 +02:00
ansuz dc80b6b11f throttle markdown preview 2017-05-24 11:27:16 +02:00
yflory f5f8e148ca Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 18:09:42 +02:00
yflory 90f5713d4a Fix an issue with the search bar redirecting to incorrect location 2017-05-23 18:09:30 +02:00
ansuz d49e6deffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 18:06:39 +02:00
ansuz 97cc4a6d54 add styling for tables in markdown preview 2017-05-23 18:03:35 +02:00
ansuz e6c04ccb49 bump server after paying for an account 2017-05-23 16:11:07 +02:00
ansuz 6faca87e73 set preview content in read only mode 2017-05-23 15:54:04 +02:00
yflory b1b7da862b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 15:04:31 +02:00
yflory b281d51d90 Fix typos in the french translation 2017-05-23 15:04:18 +02:00
ansuz 6324d9bbb0 feedback on template feature usage 2017-05-23 14:54:40 +02:00
yflory 38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 14:50:42 +02:00
yflory 964d046154 Update a french translation key 2017-05-23 14:50:28 +02:00
ansuz cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 12:35:54 +02:00
ansuz 0a646a9534 remove unnecessary space 2017-05-23 12:35:49 +02:00
yflory 6ddfe0e901 Fix new lines in /pad userlist 2017-05-23 12:14:31 +02:00
ansuz ed5b005216 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-23 11:47:09 +02:00
ansuz 91ba41b8e8 hotfix for account ids 2017-05-23 11:46:59 +02:00
yflory c3437382fb Fix the release version in the what's new popup 2017-05-23 11:22:32 +02:00
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 18:43:14 +02:00
ansuz 70cae0d2c3 safely access pin reset response 2017-05-22 18:43:06 +02:00
yflory a50805545d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 17:56:49 +02:00
yflory d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
ansuz 2ca6277660 enable pin limits by default 2017-05-22 16:50:32 +02:00
ansuz 6d38a5abc1 add new variables to example config 2017-05-22 16:49:50 +02:00
ansuz dac9d0647d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 16:39:27 +02:00
ansuz 259d34b7c8 jshint compliance 2017-05-22 16:34:22 +02:00
ansuz ff8701b6ba send note along with limit 2017-05-22 15:56:24 +02:00
yflory 40b99e7bbf Get the file name before downloading the entire file 2017-05-22 15:30:59 +02:00
ansuz 6dc3c62ba4 check for src before trying to ajax 2017-05-22 15:12:39 +02:00
ansuz a6cf761172 don't store media tag pages in the drive 2017-05-22 14:45:14 +02:00
yflory 90a9764fa4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 14:41:23 +02:00
yflory 346c289204 Fix lint errors 2017-05-22 14:39:58 +02:00
ansuz 71dc0af6c7 better test for success error codes 2017-05-22 14:37:57 +02:00
ansuz 0b6c587e2b fetch and decrypt metadata with range requests 2017-05-22 14:37:38 +02:00
yflory eb31d0323c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 12:32:10 +02:00
ansuz a99080fb74 push the rest of the code 2017-05-22 12:31:00 +02:00
yflory 408a4dad94 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 12:30:08 +02:00
yflory 3964f4feee Display the progress when downloading a file 2017-05-22 12:30:00 +02:00
ansuz dd73ad2dd5 add decryptMetadata function 2017-05-22 12:26:44 +02:00
ansuz 5179252d3b fix merge conflicts 2017-05-22 12:11:24 +02:00