Commit Graph

  • b3429c2d24 Merge branch 'creation' into soon yflory 2018-03-14 17:08:54 +01:00
  • 1dabc76bb9 Fix sframe-boot version yflory 2018-03-14 17:03:50 +01:00
  • de97c5a3ff Fix mobile detection when hiding the userlist yflory 2018-03-14 17:02:41 +01:00
  • d6228a39bd Fix userlist notifications missing for join events yflory 2018-03-14 16:34:44 +01:00
  • ebef99e5cf Owned drive yflory 2018-03-14 16:32:17 +01:00
  • 03bcd2f00d Lint compliance yflory 2018-03-14 12:12:24 +01:00
  • 3eec812aff Merge branch 'staging' into creation yflory 2018-03-14 12:07:04 +01:00
  • e977b14c1b Update French translation yflory 2018-03-14 11:50:17 +01:00
  • b1d5beca6f Translations + UI for pad creation screen v2 yflory 2018-03-14 11:37:49 +01:00
  • 645e47bd72 Catch chainpad errors in polls yflory 2018-03-13 15:10:33 +01:00
  • e56d762409 Catch chainpad errors and display it in the UI yflory 2018-03-13 14:38:56 +01:00
  • c9ed6d6bf8 New pad creation screen yflory 2018-03-13 11:31:08 +01:00
  • b2df2ba341 prototype owned file upload ansuz 2018-03-12 17:50:47 +01:00
  • 7dc7d5d950 lint compliance ansuz 2018-03-09 12:12:47 +01:00
  • 7944bc1a82 merge staging branch ansuz 2018-03-09 12:08:18 +01:00
  • 64afcb7c0b comment out busyloop workaround for tippyjs ansuz 2018-03-09 10:12:12 +01:00
  • ca65e6e54a Merge branch 'soon' ansuz 2018-03-09 10:07:38 +01:00
  • 7c99397e60 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-03-09 10:05:39 +01:00
  • 03ae9d5714 Merge branch 'soon' ansuz 2018-03-08 16:38:16 +01:00
  • 5f08ad2ea1 fix mangled 404 translation ansuz 2018-03-08 16:27:41 +01:00
  • 643fcc4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-03-08 16:15:39 +01:00
  • 2f262b12c6 Fix help box issues yflory 2018-03-08 16:15:26 +01:00
  • 34d5c04eb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-03-08 16:08:33 +01:00
  • 7091dfb669 standardize naming for the drawer, and reorder poll description ansuz 2018-03-08 16:05:47 +01:00
  • 442f15df98 Add help text in all the apps + french translation yflory 2018-03-08 15:39:46 +01:00
  • 82329dbe70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-03-08 15:06:30 +01:00
  • ec19b82609 add new help text ansuz 2018-03-08 15:06:22 +01:00
  • b1b9683141 Add links to FAQ and Privacy in static pages yflory 2018-03-08 12:17:19 +01:00
  • cbd29794b8 Improve keyboard shortcuts in the pad creation screen yflory 2018-03-08 12:16:40 +01:00
  • 2bcf28bb34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-03-07 18:24:09 +01:00
  • eac10321ba Reduce toolbar height on mobiles yflory 2018-03-07 18:24:01 +01:00
  • 71f519f982 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-03-07 17:49:57 +01:00
  • 4262c8e6e4 correct french grammar ansuz 2018-03-07 17:49:38 +01:00
  • c7e4db7f38 transcribe english faq ansuz 2018-03-07 17:48:44 +01:00
  • 7a70d69d8e Hide editor toolbars by default when using a small screen yflory 2018-03-07 17:34:55 +01:00
  • f45023ed1f Remove connection lost popup when websocket connection is lost yflory 2018-03-07 16:48:49 +01:00
  • 6a7c86aee7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-03-07 15:08:17 +01:00
  • 8cdad27ec4 French FAQ yflory 2018-03-07 15:07:39 +01:00
  • 1452d65bd4 fix missing section in privacy policy ansuz 2018-03-07 12:08:02 +01:00
  • 689368cdd7 Fix feedback for markdown toolbar and cke toolbar yflory 2018-03-07 10:57:29 +01:00
  • 3fcdbcdbc5 Faq questions yflory 2018-03-06 16:49:13 +01:00
  • 0af90ef88d resolve merge conflict ansuz 2018-03-05 15:00:57 +01:00
  • 3d66822473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-03-05 14:52:24 +01:00
  • fdf2899e88 @kpcyrd said I should update this ansuz 2018-03-05 14:51:22 +01:00
  • 978b6b95df WIP make oo encrypted ansuz 2018-03-05 14:05:53 +01:00
  • 62186bd4bd Remove tooltip when the element is removed from DOM yflory 2018-03-05 11:19:01 +01:00
  • b0dba481d8 Fix small UI issues and IE issues yflory 2018-03-02 18:33:43 +01:00
  • b7b560fcb8 Enable Cmd key support in shortcuts yflory 2018-03-01 14:48:36 +01:00
  • 12bfcbe701 Add fixed order for rightside icons in the toolbar yflory 2018-03-01 14:32:14 +01:00
  • 95bbc3d130 Add the mediatag button back in the code app yflory 2018-03-01 11:23:16 +01:00
  • ee3b926e84 Get rid of ckeditor's reset_all class... yflory 2018-03-01 10:33:28 +01:00
  • ee4d12bd57 abstract repeated call ansuz 2018-02-28 18:15:33 +01:00
  • 5b84bc1a25 simplify server ansuz 2018-02-28 18:15:01 +01:00
  • 2c90cb5907 Move help button in drawer and fix drawer style yflory 2018-02-28 17:59:27 +01:00
  • 753b7550ca Save button in the pad creation screen yflory 2018-02-28 17:02:35 +01:00
  • a4a6385e86 Add keyboard shortcuts for the Ctrl+E or Cmd+E modal yflory 2018-02-28 16:38:28 +01:00
  • dbe8ab014d Select all in drive yflory 2018-02-28 16:34:55 +01:00
  • f96a5003b0 empty spreadsheet file in test.bin ansuz 2018-02-28 13:56:33 +01:00
  • d975bb9cc0 Fix focus after pad creation screen yflory 2018-02-28 13:16:30 +01:00
  • 118ceef2f2 formatting and lint compliance ansuz 2018-02-28 11:58:35 +01:00
  • f0bc1cfe99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-02-27 17:39:27 +01:00
  • 60b2384885 Move initial state into a help block yflory 2018-02-27 17:38:29 +01:00
  • 66d83dc045 update version ansuz 2018-02-27 15:13:39 +01:00
  • 5c53868c3b Delete pads after 3 months of inactivity yflory 2018-02-26 18:23:12 +01:00
  • 50adcc791c Merge pull request #231 from sairim/patch-1 ansuz 2018-02-26 13:56:51 +01:00
  • 329fd61bb1 Remove lag when creating a pad from the pad creation screen yflory 2018-02-26 10:49:35 +01:00
  • 22f130d948 Remove lag when displaying loading screen in login and register yflory 2018-02-26 10:41:37 +01:00
  • 9b94c9b762 Update readme.md sairim 2018-02-25 16:54:49 +02:00
  • a697ad9762 Merge branch 'soon' yflory 2018-02-22 17:05:58 +01:00
  • 599afa4fc5 Merge branch 'soon' into staging yflory 2018-02-22 15:57:08 +01:00
  • 61dbf94f2d Fix pad attributes not working for readonly pads if you know the edit hash yflory 2018-02-22 15:56:23 +01:00
  • 5cc1b3c779 Merge pull request #229 from neuhaus/patch-1 ansuz 2018-02-22 14:11:31 +01:00
  • 7cc4cca846 Merge branch 'master' into patch-1 ansuz 2018-02-22 14:05:13 +01:00
  • d2b3e078d5 updated version to resolve conflict Sven Neuhaus 2018-02-22 13:05:00 +01:00
  • c409cac280 changed to AGPL-3.0-or-later Sven Neuhaus 2018-02-22 13:03:53 +01:00
  • 8c42125ea0 Merge branch 'soon' yflory 2018-02-22 12:44:28 +01:00
  • 7ff9bbe2b0 Fix share modal with new pads yflory 2018-02-22 12:43:06 +01:00
  • a0ec51dde5 Fix share modal with new pads yflory 2018-02-22 12:43:06 +01:00
  • 480b499d7b Hack to remove onbeforeunload popup yflory 2018-02-22 10:16:33 +01:00
  • 7ede2e1a07 Fix cursor position when editing a task in todo yflory 2018-02-20 18:43:14 +01:00
  • c34161a988 Update oocell config yflory 2018-02-20 18:36:00 +01:00
  • acf09c807d Fix fonts yflory 2018-02-20 16:09:49 +01:00
  • 9ba912d953 Clean onlyoffice files yflory 2018-02-20 15:46:48 +01:00
  • db71fe5bf8 Rename font files yflory 2018-02-20 15:23:24 +01:00
  • d53ea25111 Merge branch 'soon' yflory 2018-02-20 14:42:32 +01:00
  • 5f50bedce2 Fix empty properties for readonly pads yflory 2018-02-20 14:42:11 +01:00
  • 15a8196037 Enable pad creation screen yflory 2018-02-20 10:39:02 +01:00
  • 70670f9732 Merge branch 'soon' yflory 2018-02-20 10:24:03 +01:00
  • 2eef1e96e6 Remove invalid error reports yflory 2018-02-20 10:21:15 +01:00
  • 75cb373136 Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo yflory 2018-02-19 18:54:28 +01:00
  • 7cb3282634 New apps for text, slide and spreadsheet yflory 2018-02-19 18:52:57 +01:00
  • 50ef40a862 Merge branch 'soon' into staging yflory 2018-02-19 14:08:12 +01:00
  • 766fa72841 Fix initial value of the preview link in the share modal yflory 2018-02-19 14:07:21 +01:00
  • 831c23b259 Merge branch 'staging' into oo yflory 2018-02-19 12:11:58 +01:00
  • 5d584625e4 FAQ pages yflory 2018-02-19 12:11:45 +01:00
  • 5c1e5a3f49 Merge branch 'staging' into oo yflory 2018-02-19 12:11:06 +01:00
  • 299a2f4c08 FAQ placeholder yflory 2018-02-19 12:09:57 +01:00
  • 1b7b53a164 Merge branch 'soon' yflory 2018-02-19 11:39:55 +01:00
  • 5dbc99343a Improve 'rename' input in the drive yflory 2018-02-19 11:38:57 +01:00
  • b04e3def64 Fix invalid translation key yflory 2018-02-19 11:26:43 +01:00