Commit Graph

  • 1ae7076790 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad Paul Libbrecht 2017-09-07 22:08:34 +0200
  • f2aaaa9751 Move slide to secure iframe yflory 2017-09-07 18:56:58 +0200
  • 809b56625d refactor ui elements ansuz 2017-09-07 18:54:58 +0200
  • bca9ba66cb enforce a configurable minimum password length when registering ansuz 2017-09-07 17:43:58 +0200
  • ef30b0bc42 contribute to z-index arms race ansuz 2017-09-07 16:50:06 +0200
  • 1958bca984 restore hashing screen in login and register ansuz 2017-09-07 16:48:17 +0200
  • fab6264ce6 use loading screen from pages.js ansuz 2017-09-07 16:41:11 +0200
  • a6eb1444df add loading screen markup to register and login ansuz 2017-09-07 16:39:42 +0200
  • 352d504944 avoid loading unnecessary files ansuz 2017-09-07 16:39:20 +0200
  • e8298f165a only display first letter of name if user has no avatar ansuz 2017-09-07 16:35:24 +0200
  • 85003f7a23 lint compliance ansuz 2017-09-07 14:21:54 +0200
  • 263c2eb2c2 fix overflowing title text ansuz 2017-09-07 14:17:43 +0200
  • cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-07 12:45:18 +0200
  • 15e24ebe4f ui for hashtag picker ansuz 2017-09-07 12:45:07 +0200
  • 1b97996ef8 implement util.once ansuz 2017-09-07 12:26:05 +0200
  • 0423a5f4e2 Clean secure iframe code yflory 2017-09-06 18:26:10 +0200
  • 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings yflory 2017-09-06 16:05:20 +0200
  • fe8b2c2556 Fix french translation yflory 2017-09-06 15:43:30 +0200
  • 61b228db79 Fix double / when storing a file yflory 2017-09-06 11:41:09 +0200
  • 8b2733e2da Fix typo yflory 2017-09-06 11:37:19 +0200
  • 1be12a7f15 Merge branch 'soon' into staging yflory 2017-09-06 11:21:59 +0200
  • 8f2776657b Add translations for pad embed yflory 2017-09-06 11:21:53 +0200
  • c713b44a4a Merge branch 'soon' yflory 2017-09-06 11:13:10 +0200
  • d98bbf7df9 Fix the pad app when cryptpad is in an iframe yflory 2017-09-06 11:03:20 +0200
  • 3ca9f41290 Get embed code for pad and code yflory 2017-09-06 10:56:27 +0200
  • 0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 18:40:18 +0200
  • e85b34f127 Add embed options in the secure pad hashes yflory 2017-09-05 18:38:51 +0200
  • 47ec959032 make sure contenteditable is not set in read only mode ansuz 2017-09-05 18:35:11 +0200
  • 6a735b441f use paul's print styles ansuz 2017-09-05 18:16:06 +0200
  • e7de9229a8 Do not print toolbar and collaboration (#178). paul Paul Libbrecht 2017-09-05 17:29:03 +0200
  • b3d5e04bb4 lint compliance ansuz 2017-09-05 17:23:16 +0200
  • 3d2a2da74e add listAllTags api ansuz 2017-09-05 16:52:22 +0200
  • 31a6881dba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 15:40:02 +0200
  • 305feebbbe Fix scroll position when refreshing the drive tree yflory 2017-09-05 15:39:49 +0200
  • 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-05 15:37:02 +0200
  • 1c50bb3f61 clear hung tooltips ansuz 2017-09-05 15:36:46 +0200
  • d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 15:34:49 +0200
  • 53eb9bb541 Remove the logo from the filepicker loading screen yflory 2017-09-05 15:34:38 +0200
  • 5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-05 15:32:31 +0200
  • 77bbb3add4 bump footer and package.json version string ansuz 2017-09-05 15:29:28 +0200
  • 01881ac469 Update loading tips in the french translation yflory 2017-09-05 15:15:57 +0200
  • 729c013af7 Get mediatag embed code from the file app yflory 2017-09-05 15:08:05 +0200
  • c790442736 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-05 12:18:16 +0200
  • 5eb13461c0 remove anchor button ansuz 2017-09-05 12:16:49 +0200
  • 904936209a Remove loading tips in the file picker yflory 2017-09-05 11:59:42 +0200
  • 98cd69e53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 11:57:54 +0200
  • 204e45dfae Enable templates in pad yflory 2017-09-05 11:57:44 +0200
  • 38e1ed93e4 Merge branch 'code2' into staging ansuz 2017-09-05 11:42:00 +0200
  • 4108520d20 Add contacts in the new menu if the user is logged in yflory 2017-09-05 11:43:16 +0200
  • acaf45a0e0 drop thumbnails if metadata is too large ansuz 2017-09-05 11:38:49 +0200
  • 78b338c379 Merge branch 'code2' into staging yflory 2017-09-05 11:38:17 +0200
  • db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 yflory 2017-09-05 11:36:31 +0200
  • d2787e3eff Make code2 the default code app yflory 2017-09-05 11:35:15 +0200
  • 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 ansuz 2017-09-05 11:27:11 +0200
  • d42d988d36 make test more resilient ansuz 2017-09-05 11:26:41 +0200
  • cd7b00d45b make pixels 100px ansuz 2017-09-05 11:25:35 +0200
  • e8ac5ed87f add a test for thumbnails ansuz 2017-09-05 11:24:30 +0200
  • b1a1f4ba13 add encrypted thumbnails to metadata for images. ansuz 2017-09-05 10:49:26 +0200
  • b8e913c95a more thumbnail methods ansuz 2017-09-05 10:46:00 +0200
  • ffbb21dd2c use cryptpad-september build of media-tag ansuz 2017-09-05 10:43:48 +0200
  • 2aa6458039 Merge pull request #177 from xshadow/xshadow-cryptpad-readme-ansible ansuz 2017-09-05 10:11:34 +0200
  • 05b11415c4 Updated Readme.md with hint for ansible setup xshadow 2017-09-04 22:00:11 +0200
  • c0f14dea5e Store code2 and set the title at the first visit yflory 2017-09-04 17:09:45 +0200
  • 86e23ac19f Use less2 in secure iframes yflory 2017-09-04 15:09:54 +0200
  • f12f4bb925 Integrate filepicker secure iframe in the code2 app yflory 2017-09-01 15:17:14 +0200
  • a10bab893f jshintignore media-tag ansuz 2017-08-31 18:45:18 +0200
  • a164115e8c Add media-tag-nacl to cryptpad so it will be hosted on the server Caleb James DeLisle 2017-08-31 16:28:48 +0200
  • 7b27b8635d fix padding on registration button ansuz 2017-08-31 18:58:08 +0200
  • 6bb29e52e2 lint compliance ansuz 2017-08-31 18:45:18 +0200
  • 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-31 18:12:21 +0200
  • ae60b5845f implement search-by-tag for filesData ansuz 2017-08-31 18:12:13 +0200
  • 72ef730f23 implement tag-related functions ansuz 2017-08-31 18:06:26 +0200
  • 0302c06d0e send feedback if client does not support symbols ansuz 2017-08-31 18:04:20 +0200
  • 52019dc763 make get and set pad attribute return only cloned data ansuz 2017-08-31 18:02:44 +0200
  • 89b7b644f3 Enable drag & upload in code2 and prepare filepicker yflory 2017-08-31 16:32:26 +0200
  • e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server Caleb James DeLisle 2017-08-31 16:28:48 +0200
  • 885282ddea Fix undefined friend yflory 2017-08-31 15:49:20 +0200
  • 0ceb4cbbcb Updated the contact page with the new design CatalinScr 2017-08-31 16:26:20 +0300
  • 83be769bb3 Merge branch 'master' into staging updated with new version CatalinScr 2017-08-31 11:36:39 +0300
  • 1bf77cb77e changed the icons CatalinScr 2017-08-31 11:27:02 +0300
  • ee325c1813 Repaired the errors from lint CatalinScr 2017-08-31 10:20:10 +0300
  • f95f3f4f24 Updated the contact page CatalinScr 2017-08-31 10:04:40 +0300
  • a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing Caleb James DeLisle 2017-08-30 19:23:01 +0200
  • b8971cdc23 Add previewMode settings to code2 yflory 2017-08-30 18:47:50 +0200
  • 0d008aaa2e Add indent settings to code2 yflory 2017-08-30 17:57:10 +0200
  • f54dc7505c Migrate indentation settings to a settings subobject yflory 2017-08-30 17:19:50 +0200
  • 0893bcc0e5 Merge branch 'staging' into code2 yflory 2017-08-30 14:57:19 +0200
  • f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-30 12:26:23 +0200
  • 0ce32464fd Fix flickering avatar in firefox yflory 2017-08-30 12:26:11 +0200
  • 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-30 11:31:59 +0200
  • ba0e935add stub localStorage, and handle errors that might come from touching localStorage ansuz 2017-08-30 11:31:49 +0200
  • be8ea4102e keep trying to parse the hash until it works ansuz 2017-08-30 11:26:51 +0200
  • 4db4f66786 Remove an unnecessary fix for Safari yflory 2017-08-30 11:14:58 +0200
  • d3e947f17e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-30 11:11:48 +0200
  • 7498057c89 Fix Safari iframe size yflory 2017-08-30 11:11:43 +0200
  • a2ed266048 Move the code app in a secure iframe yflory 2017-08-30 11:10:57 +0200
  • 1044531806 Fix Safari iframe size issue Caleb James DeLisle 2017-08-30 11:04:52 +0200
  • a34d1793e0 drop 'loading' text from loading screen ansuz 2017-08-29 18:15:40 +0200
  • 2ef4ebc6ef two new tips for the loading screen ansuz 2017-08-29 17:56:34 +0200
  • 595fa4c2e4 Merge branch 'soon' ansuz 2017-08-29 12:00:16 +0200