Commit Graph

  • f9023185c1 move documentation into docs folder ansuz 2017-05-31 10:10:33 +0200
  • 1c04af5b30 add disclaimer to top of example nginx config ansuz 2017-05-31 10:07:58 +0200
  • daf112a5b5 take api settings into account for upgrade button ansuz 2017-05-30 20:11:15 +0200
  • ebfa228bc0 add upgrade button to all static pages ansuz 2017-05-30 18:39:41 +0200
  • 149568689a color donate button green ansuz 2017-05-30 17:58:31 +0200
  • ec6ad6772b send feedback on donation ansuz 2017-05-30 17:25:36 +0200
  • cb2efe138b Media Tag integration, image, audio, video, pdf Daniel RADEAU 2017-05-30 16:36:06 +0200
  • 8507f77116 throw if adminEmail and allowSubscriptions are not compatible ansuz 2017-05-30 16:27:42 +0200
  • 76c530037b enable donate button in all apps ansuz 2017-05-30 15:51:07 +0200
  • 9ca5bc507e add support for donate button ansuz 2017-05-30 15:42:53 +0200
  • 909bc2ebf3 add new translation key ansuz 2017-05-30 15:39:13 +0200
  • 605377cf31 update default configuration file with new attributes and comments ansuz 2017-05-30 15:35:51 +0200
  • 81b931e56f Update messages.pt-br.js Gustavo H M Silva 2017-05-30 09:45:14 -0300
  • a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-30 10:46:17 +0200
  • 99a44f119f don't send referrer headers on pads which may link outward ansuz 2017-05-30 10:44:40 +0200
  • 75874424cf add 'support cryptpad' translation key ansuz 2017-05-30 10:41:46 +0200
  • 08619e733a Partial translation + duplicated token fix Gustavo H M Silva 2017-05-29 15:19:04 -0300
  • 2d2e00b569 Merged translated and non-translated in pt-BR Gustavo H M Silva 2017-05-29 14:43:15 -0300
  • 92a7970eb8 fix merge conflicts ansuz 2017-05-29 19:04:47 +0200
  • a15ef44a12 Merge pull request #126 from pbondoer/spanish ansuz 2017-05-29 18:55:04 +0200
  • 0a92719763
    spanish! new keys ahoy Pierre Bondoerffer 2017-05-29 18:25:18 +0200
  • c4f8286be6 add timestamp to rpc error logs ansuz 2017-05-29 17:35:13 +0200
  • 1240b864ef fix misconfigured history ansuz 2017-05-29 17:25:06 +0200
  • 6518b56945
    poll: french messages Pierre Bondoerffer 2017-05-29 16:50:25 +0200
  • f434f002c4
    poll: make locks clickable Pierre Bondoerffer 2017-05-29 16:32:40 +0200
  • 3915b30055 provide a register button on login ansuz 2017-05-29 13:11:07 +0200
  • b6bb576a34
    Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll Pierre Bondoerffer 2017-05-29 12:59:49 +0200
  • b910915d47 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-29 11:33:03 +0200
  • 6573813523 Merge branch 'soon' into staging ansuz 2017-05-29 11:32:54 +0200
  • 41a8604cb8 Merge pull request #122 from superniko/patch-2 ansuz 2017-05-29 10:48:24 +0200
  • 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place Caleb James DeLisle 2017-05-26 18:09:31 +0200
  • 1092285a68
    merge master Pierre Bondoerffer 2017-05-26 16:18:51 +0200
  • 6c1861dbc6 Merge branch 'soon' into staging Caleb James DeLisle 2017-05-26 15:48:44 +0200
  • 0559b8cb77 Update messages.ro.js superniko 2017-05-26 16:47:45 +0300
  • 9068a8ed58 Merge branch 'patch-1' of git://github.com/superniko/cryptpad into soon Caleb James DeLisle 2017-05-26 15:36:44 +0200
  • 2ecf257fcd Sync localStorage with sessionStorage in auth because safari... Caleb James DeLisle 2017-05-26 15:30:01 +0200
  • 3f3d64992d resolve merge conflicts ansuz 2017-05-26 12:44:58 +0200
  • 57017c68fa hacks for cross-domain safari ansuz 2017-05-26 12:42:12 +0200
  • cf658c1b3a backport live changes ansuz 2017-05-26 12:41:30 +0200
  • 70fbbe0078 Update messages.ro.js superniko 2017-05-25 10:23:27 +0300
  • a04f179d8b hide preview mode on phones ansuz 2017-05-24 19:00:14 +0200
  • df2b00122a New drive structure without file names yflory 2017-05-24 18:59:44 +0200
  • dc2b0ae6b4 jshint compliance ansuz 2017-05-24 18:45:48 +0200
  • b32c329269 remember whether you were using preview mode for a pad ansuz 2017-05-24 18:41:19 +0200
  • d9f7470f06 copy user details into sessionStorage for safari ansuz 2017-05-24 18:28:16 +0200
  • a5ffd278a7 write styles for code in .less ansuz 2017-05-24 17:27:03 +0200
  • 3803f6a20f only render preview if preview container is visible ansuz 2017-05-24 17:25:33 +0200
  • 617e027f12 catch markdown preview errors ansuz 2017-05-24 15:50:35 +0200
  • bc26f7fc4e Merge branch 'soon' into staging ansuz 2017-05-24 15:04:40 +0200
  • 70c1061f47 Fix romanian translation Caleb James DeLisle 2017-05-24 14:49:00 +0200
  • 83c0a6d37d Romanian translation Caleb James DeLisle 2017-05-24 14:37:13 +0200
  • c5bb830757 don't preview if hightlight mode is not markdown ansuz 2017-05-24 14:21:31 +0200
  • fd83ae3e61 implement createRandomInteger ansuz 2017-05-24 11:34:40 +0200
  • 4d9060f49e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-24 11:28:06 +0200
  • 378bf2aa94 yflory's word wrap fix ansuz 2017-05-24 11:27:31 +0200
  • dc80b6b11f throttle markdown preview ansuz 2017-05-24 11:27:16 +0200
  • f5f8e148ca Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-23 18:09:42 +0200
  • 90f5713d4a Fix an issue with the search bar redirecting to incorrect location yflory 2017-05-23 18:09:30 +0200
  • d49e6deffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-23 18:06:39 +0200
  • 97cc4a6d54 add styling for tables in markdown preview ansuz 2017-05-23 18:03:35 +0200
  • e6c04ccb49 bump server after paying for an account ansuz 2017-05-23 16:11:07 +0200
  • 6faca87e73 set preview content in read only mode ansuz 2017-05-23 15:54:04 +0200
  • b1b7da862b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-23 15:04:31 +0200
  • b281d51d90 Fix typos in the french translation yflory 2017-05-23 15:04:18 +0200
  • 6324d9bbb0 feedback on template feature usage ansuz 2017-05-23 14:54:40 +0200
  • 38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-23 14:50:42 +0200
  • 964d046154 Update a french translation key yflory 2017-05-23 14:50:28 +0200
  • cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-23 12:35:54 +0200
  • 0a646a9534 remove unnecessary space ansuz 2017-05-23 12:35:49 +0200
  • 6ddfe0e901 Fix new lines in /pad userlist yflory 2017-05-23 12:14:31 +0200
  • ed5b005216 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-05-23 11:47:09 +0200
  • 91ba41b8e8 hotfix for account ids ansuz 2017-05-23 11:46:59 +0200
  • c3437382fb Fix the release version in the what's new popup yflory 2017-05-23 11:22:32 +0200
  • 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-22 18:43:14 +0200
  • 70cae0d2c3 safely access pin reset response ansuz 2017-05-22 18:43:06 +0200
  • a50805545d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 17:56:49 +0200
  • d55b7e411c Display an alert in the drive when the limit is reached yflory 2017-05-22 17:55:10 +0200
  • 2ca6277660 enable pin limits by default ansuz 2017-05-22 16:50:32 +0200
  • 6d38a5abc1 add new variables to example config ansuz 2017-05-22 16:49:50 +0200
  • dac9d0647d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-22 16:39:27 +0200
  • 259d34b7c8 jshint compliance ansuz 2017-05-22 16:34:22 +0200
  • ff8701b6ba send note along with limit ansuz 2017-05-22 15:56:24 +0200
  • 40b99e7bbf Get the file name before downloading the entire file yflory 2017-05-22 15:30:59 +0200
  • 6dc3c62ba4 check for src before trying to ajax ansuz 2017-05-22 15:12:39 +0200
  • a6cf761172 don't store media tag pages in the drive ansuz 2017-05-22 14:45:14 +0200
  • 90a9764fa4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 14:41:23 +0200
  • 346c289204 Fix lint errors yflory 2017-05-22 14:39:58 +0200
  • 71dc0af6c7 better test for success error codes ansuz 2017-05-22 14:37:57 +0200
  • 0b6c587e2b fetch and decrypt metadata with range requests ansuz 2017-05-22 14:37:38 +0200
  • eb31d0323c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 12:32:10 +0200
  • a99080fb74 push the rest of the code ansuz 2017-05-22 12:31:00 +0200
  • 408a4dad94 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 12:30:08 +0200
  • 3964f4feee Display the progress when downloading a file yflory 2017-05-22 12:30:00 +0200
  • dd73ad2dd5 add decryptMetadata function ansuz 2017-05-22 12:26:44 +0200
  • 5179252d3b fix merge conflicts ansuz 2017-05-22 12:11:24 +0200
  • 6e7fe87974 WIP debug file upload errors. use better error strings ansuz 2017-05-22 12:06:29 +0200
  • 4ee42b87d4 make file crypto great again ansuz 2017-05-22 12:04:47 +0200
  • c45f08f147 Use a download button instead of downloading a file automatically yflory 2017-05-22 11:43:45 +0200
  • 0c2f84058b Improve css for the file app yflory 2017-05-22 11:16:01 +0200
  • 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 10:41:55 +0200