Commit Graph

  • 7559bc062e lint compliance ansuz 2017-10-05 17:06:02 +02:00
  • 080511efcd add missing translation for hashtags ansuz 2017-10-05 17:01:39 +02:00
  • 503111d26a use recompiled media-tag ansuz 2017-10-05 17:00:47 +02:00
  • 427afc3954 override modified file name in pdfjs ansuz 2017-10-05 16:59:55 +02:00
  • d85db64939 add tags from drive ansuz 2017-10-05 16:58:34 +02:00
  • 0aecfad854 Occasionally the language selector only says "Mode" rather than the language Caleb James DeLisle 2017-10-05 16:12:49 +03:00
  • ae87320408 Preview pane cannot be resized after it has been hidden and then shown again Caleb James DeLisle 2017-10-05 16:12:24 +03:00
  • 1f35798194 stop event propagation from tag prompt ansuz 2017-10-05 15:08:34 +02:00
  • c936e5ae73 make context menu open correct app on correct port ansuz 2017-10-05 11:14:41 +02:00
  • d9e97b86e6 Merge branch 'staging' into framework Caleb James DeLisle 2017-10-05 12:14:37 +03:00
  • 383c2f54cb 1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation. Caleb James DeLisle 2017-10-05 12:14:03 +03:00
  • deed04108b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-05 10:22:07 +02:00
  • a90c078e84 correct reference to undefined ansuz 2017-10-05 10:21:59 +02:00
  • 26dfc65c25 Comments in polls yflory 2017-10-04 19:06:16 +02:00
  • 5304dc319f Enable redirection to the previous page after registration yflory 2017-10-04 15:55:57 +02:00
  • ceb8ff18bd Fix ghost icon in drive yflory 2017-10-04 15:51:44 +02:00
  • 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag yflory 2017-10-04 15:39:18 +02:00
  • 68bda92291 Use codemirror for description in poll yflory 2017-10-03 19:04:29 +02:00
  • e2f53eaddb add loading screen tip about hashtags ansuz 2017-10-03 18:39:03 +02:00
  • b8ce149db6 add hint about tag usage ansuz 2017-10-03 18:36:34 +02:00
  • f15ec4efe9 add tagging to whiteboard and file apps ansuz 2017-10-03 18:05:28 +02:00
  • f90742603e style fixes ansuz 2017-10-03 17:53:28 +02:00
  • d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click. Caleb James DeLisle 2017-10-03 17:57:57 +03:00
  • 707d3b3e94 Ability to export polls as csv yflory 2017-10-03 16:50:59 +02:00
  • 5cf86bf74a Update UI in poll and remove old code yflory 2017-10-03 14:11:11 +02:00
  • 09c0a473e2 fix function signatures ansuz 2017-10-03 14:08:40 +02:00
  • 3337689630 Wrong translation key in toolbar yflory 2017-10-03 14:04:07 +02:00
  • 94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide Caleb James DeLisle 2017-10-03 12:10:16 +03:00
  • 126742a1c3 Fix bugs in sframe poll and update UI yflory 2017-10-02 19:02:31 +02:00
  • 351b95d6a9 resolve merge conflicts ansuz 2017-10-02 18:59:47 +02:00
  • 6c7b135f91 lint compliance ansuz 2017-10-02 18:58:18 +02:00
  • 94c392b79f secure messaging ansuz 2017-10-02 18:57:17 +02:00
  • 53f65f6a87 Merge branch 'staging' into framework Caleb James DeLisle 2017-10-02 17:46:27 +03:00
  • fa6938baa8 1. Migrated /slide/ to use framework 2. Fixed CSS not being applied on /slide/ 3. Minor changes to /code/ to reuse code which is also used on /slide/ Caleb James DeLisle 2017-10-02 17:34:37 +03:00
  • 1e5bc5da14 onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer Caleb James DeLisle 2017-10-02 15:09:25 +03:00
  • 7230c780a1 Get rid of last usages of cryptpad-common in pad/inner Caleb James DeLisle 2017-10-02 15:06:01 +03:00
  • 12e82e80ec When changing the title of a presentation, the title in the bottom of the slide should also change Caleb James DeLisle 2017-10-02 15:04:44 +03:00
  • 0a99478d9f catch diffdom errors and plow through ansuz 2017-09-28 11:50:35 +02:00
  • 0f9e93e1de make tests pass again ansuz 2017-09-28 10:36:40 +02:00
  • 48c49e5a75 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-28 10:23:59 +02:00
  • 19e58cec94 prevent typeError ansuz 2017-09-28 10:23:48 +02:00
  • 66da349ee4 Sandboxed Poll app with less2 yflory 2017-09-27 18:52:04 +02:00
  • f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ Caleb James DeLisle 2017-09-27 16:53:16 +02:00
  • 6dbc02e81a Merge branch 'staging' into framework Caleb James DeLisle 2017-09-27 12:01:18 +02:00
  • 1c791b5b51 Fix framework by removing some async and also fix media tags Caleb James DeLisle 2017-09-27 11:58:14 +02:00
  • 90d00c10b1 Make metadata-manager a bit more robust Caleb James DeLisle 2017-09-27 11:56:25 +02:00
  • 9b2251005c Merge branch 'staging' into newpoll yflory 2017-09-27 10:36:33 +02:00
  • 8de1852ab9 Lint compliance yflory 2017-09-27 10:36:16 +02:00
  • 2c10f9b07b Merge branch 'staging' into newpoll yflory 2017-09-27 10:32:03 +02:00
  • e02a779c14 Use secure drive as default drive yflory 2017-09-27 10:31:35 +02:00
  • b4de31c827 Merge branch 'newdrive' into staging yflory 2017-09-27 10:28:16 +02:00
  • c1275b5671 Prepare secure poll yflory 2017-09-27 10:28:10 +02:00
  • 767027b237 Lint yflory 2017-09-27 10:16:24 +02:00
  • 4c394e0031 Fix UI issue in poll yflory 2017-09-27 10:15:23 +02:00
  • 0df9e5ace0 Fix toolbar in polls yflory 2017-09-27 10:09:47 +02:00
  • 342b6012f7 manual merge of staging into framework Caleb James DeLisle 2017-09-26 17:11:45 +02:00
  • cf6030ab8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-26 15:58:33 +02:00
  • e62c5e1d07 Add some debugging lines to help synthesize error cases Caleb James DeLisle 2017-09-26 15:58:25 +02:00
  • 9571b3c018 persist whiteboard content across sessions ansuz 2017-09-26 15:16:17 +02:00
  • 748172585e update for modified id ansuz 2017-09-26 15:00:25 +02:00
  • 4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-26 14:35:02 +02:00
  • 345bfc1cea Remove migration for pad attributes yflory 2017-09-26 14:36:49 +02:00
  • 52be5501d6 remove invalid test ansuz 2017-09-26 14:34:54 +02:00
  • 69014e5fde Fix mediatags in pad not cached yflory 2017-09-26 11:21:36 +02:00
  • b3e066eaca show loading screen tips during loading screen ansuz 2017-09-26 10:59:25 +02:00
  • 77fe6a9bba small bug fixes Caleb James DeLisle 2017-09-26 10:23:35 +02:00
  • 1b01855dd2 Merge branch 'staging' into framework Caleb James DeLisle 2017-09-25 18:11:57 +02:00
  • 1fd7a6e2b3 Mistake in mkEvent which makes all events only work once Caleb James DeLisle 2017-09-25 18:03:31 +02:00
  • 368a6b2406 manual merge, still wip Caleb James DeLisle 2017-09-25 17:35:25 +02:00
  • cdeac00633 Merge branch 'staging' into newdrive yflory 2017-09-25 17:35:06 +02:00
  • a8eecee590 Fix access to undefined variable in drive yflory 2017-09-25 17:29:31 +02:00
  • 91e36171eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-25 17:09:41 +02:00
  • 138ad17e3e Fix 'import local pads' in settings creating duplicates yflory 2017-09-25 17:09:26 +02:00
  • 59ad96e491 Make sure the user is redirected to the drive at registration yflory 2017-09-25 16:11:50 +02:00
  • d2f1d0c0e9 Fix readme pad not added at registration in sframe drive yflory 2017-09-25 16:09:54 +02:00
  • ae54cbca33 Refactor sframe-cpnf-inner to export chainpad Caleb James DeLisle 2017-09-25 15:44:03 +02:00
  • 44018ee7e1 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. Caleb James DeLisle 2017-09-25 15:43:02 +02:00
  • b15527565c Allow passing arguments when firing events Caleb James DeLisle 2017-09-25 15:42:08 +02:00
  • 0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/ Caleb James DeLisle 2017-09-25 15:45:08 +02:00
  • d9845d3450 Refactor sframe-cpnf-inner to export chainpad Caleb James DeLisle 2017-09-25 15:44:03 +02:00
  • f418ee9632 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. Caleb James DeLisle 2017-09-25 15:43:02 +02:00
  • 72f03b2a47 Allow passing arguments when firing events Caleb James DeLisle 2017-09-25 15:42:08 +02:00
  • 1afbd4648d Fix old drive yflory 2017-09-25 15:23:42 +02:00
  • b871faffc9 Enable tags in code and slide yflory 2017-09-25 14:47:31 +02:00
  • 6aeb366767 Lint yflory 2017-09-25 14:47:19 +02:00
  • 0600ce59ec Display the 'spinner' when typing in sframe apps yflory 2017-09-25 13:19:25 +02:00
  • 1d7683503f Fix link origin in sframe upload table yflory 2017-09-25 12:44:05 +02:00
  • 92c808812a Fix missing style in toolbar/less2 yflory 2017-09-25 11:59:05 +02:00
  • deba699d08 Remove old style for sframe drive yflory 2017-09-25 11:54:01 +02:00
  • 4049931924 Lint yflory 2017-09-25 11:51:24 +02:00
  • c364377d7c Use less2 in sframe drive yflory 2017-09-25 11:48:42 +02:00
  • 47fe7b1c53 Drive in sandboxed iframe yflory 2017-09-22 19:35:06 +02:00
  • dfdeb7b113 Fix style and race condition for history mode yflory 2017-09-21 18:00:11 +02:00
  • a810d7bd85 Fix style and race condition for history mode yflory 2017-09-21 18:00:11 +02:00
  • 456370b1aa Base for Drive in sandboxed iframe yflory 2017-09-21 17:56:24 +02:00
  • 95302366d1 lint compliance ansuz 2017-09-21 11:19:23 +02:00
  • 68f7d4bc0a more conformant tagPrompt behaviour ansuz 2017-09-20 17:55:05 +02:00
  • db4c3e7e2c Merge branch 'master' into staging ansuz 2017-09-20 12:07:01 +02:00
  • b5b84f540e fix preview mode class ansuz 2017-09-20 12:02:46 +02:00
  • 53b98c12c9 ignore broken stylesheet ansuz 2017-09-20 11:33:30 +02:00