Commit Graph

  • 1bb87164f0 Merge branch 'soon' into staging yflory 2017-03-01 16:16:59 +0100
  • 55210f17eb Clean the code to be less dependant on 'li' yflory 2017-03-01 16:15:48 +0100
  • 3e9c4d0901
    Add hover to file manager tree Pierre Bondoerffer 2017-03-01 15:57:22 +0100
  • cbdfae09a6
    Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-01 15:53:48 +0100
  • c6c3e1bbb5 Don't select subfolders in the tree when drag&drop yflory 2017-03-01 15:53:31 +0100
  • d605fc757b
    Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-01 15:46:49 +0100
  • a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop yflory 2017-03-01 15:46:10 +0100
  • cb5e01815c validate all alertify strings by default. require 'force' argument to bypass ansuz 2017-03-01 15:07:34 +0100
  • b0323f6fd9
    Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-01 14:45:18 +0100
  • a2b5200381 Add a container for the folders in the tree in the drive yflory 2017-03-01 14:44:43 +0100
  • bd42a7d176 bump hyperjson bower dependency to new major version ansuz 2017-03-01 14:36:41 +0100
  • 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security yflory 2017-03-01 13:10:55 +0100
  • 11d54256da Make sure the display name is displayed in the same way everywhere yflory 2017-03-01 13:10:06 +0100
  • 2c5c6da0d9 Fix XSS in alertify logs yflory 2017-03-01 13:09:14 +0100
  • 5797aab3f2 Fix XSS with display names in the user list yflory 2017-03-01 13:08:36 +0100
  • 26e3971482 Fix XSS in the user dropdown menu yflory 2017-03-01 13:08:09 +0100
  • 639376f1cb don't use hyperjson.toString ansuz 2017-03-01 12:36:10 +0100
  • eb9a39eb68
    Add hover on elements in drive and make grid slightly prettier Pierre Bondoerffer 2017-02-28 23:15:47 +0100
  • 3619fdc77a bump cryptpad version number ansuz 2017-02-28 19:04:54 +0100
  • 84a4a15c46 fix inverted checkbox description ansuz 2017-02-28 18:58:20 +0100
  • e2acf15ed8 Merge pull request #91 from pbondoer/staging ansuz 2017-02-28 18:49:51 +0100
  • f11b03c16e
    Spanish translation updated 🎉 Pierre Bondoerffer 2017-02-28 18:47:58 +0100
  • f130fd0598 Fix horizontal scrollbar in edge yflory 2017-02-28 18:02:12 +0100
  • 345d2faab2 Fix horizontal scrollbar in Edge #3 yflory 2017-02-28 17:13:51 +0100
  • d683dc499a Fix horizontal scrollbar in Edge #2 yflory 2017-02-28 17:03:23 +0100
  • 7a0a87bf6c Fix horizontal scrollbar in Edge yflory 2017-02-28 16:38:51 +0100
  • 3bf85b113c don't hide overflow, that causes worse problems ansuz 2017-02-28 16:37:34 +0100
  • f06196c261 Remove the context menu buttons when removing selection yflory 2017-02-28 15:48:49 +0100
  • 65202bd619 Fix french translation with the drive readme yflory 2017-02-28 15:02:11 +0100
  • c0278ba77f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 13:12:53 +0100
  • efb7380a12 Fix default pad not created after registration yflory 2017-02-28 13:12:27 +0100
  • 5d39125004 Make onSettle Async Again ansuz 2017-02-28 13:12:04 +0100
  • 3380b13c95 remove horizontal scroll on edge ansuz 2017-02-28 12:29:53 +0100
  • 10c41369de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-28 12:25:40 +0100
  • 8c87255267 remove any mention of piwik ansuz 2017-02-28 12:25:31 +0100
  • 8007f51655 Update french translation yflory 2017-02-28 12:01:32 +0100
  • 1c7561f37e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 11:51:23 +0100
  • 6967b67485 Update french translation suing new best practices yflory 2017-02-28 11:51:18 +0100
  • 569d25f25f update some translation keys in English ansuz 2017-02-28 11:50:07 +0100
  • b87c9d4ba6 fix merge conflicts with usability branch ansuz 2017-02-28 11:35:29 +0100
  • 5a49e276b5 add settings_anonymous key ansuz 2017-02-28 11:32:14 +0100
  • 4f4075ed6e Make the settings app available to anonymous users yflory 2017-02-28 11:23:50 +0100
  • 0224d6489b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 11:06:50 +0100
  • 12aec60a12 hack around onSettle not doing its job ansuz 2017-02-28 11:05:59 +0100
  • 0ae7f94184 Remove the pointer and text underline on icon:hover in drive yflory 2017-02-28 10:50:52 +0100
  • 69b6f80e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-28 10:47:23 +0100
  • 86adfbf27d update cache-busting directive in all supported apps ansuz 2017-02-28 10:47:18 +0100
  • cfc9f2e622 remove code for 'user' app, now that we have login and register ansuz 2017-02-28 10:46:21 +0100
  • ec7761eeb8 Make sure we don't use a wrong title for a new pad yflory 2017-02-28 10:43:36 +0100
  • 8e7e1d336e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 10:39:53 +0100
  • 96f6b5755d Add the blog link in the header and footer yflory 2017-02-28 10:39:48 +0100
  • d49a7d7ec4 fix undefined reference ansuz 2017-02-28 10:30:24 +0100
  • ccd195d318 Translate user feedback keys in french yflory 2017-02-28 10:28:07 +0100
  • 9a2ed5741a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-27 20:11:26 +0100
  • a4913f2f4b provide UI for disabling the user feedback api ansuz 2017-02-27 20:11:18 +0100
  • 1a259bb3aa check if user has disallowed feedback api ansuz 2017-02-27 20:02:54 +0100
  • 4f7a05ead2 Fix issue with the path for the trash in the drive's topbar yflory 2017-02-27 18:37:44 +0100
  • 8741b50f5b Set the file name as default title if a pad is created from the drive yflory 2017-02-27 18:15:18 +0100
  • e8c73f35ce In the tree, display the rename input only once yflory 2017-02-27 17:50:58 +0100
  • e38df7ce47 Fix creation of new pads in /pad yflory 2017-02-27 17:47:11 +0100
  • 20518a3e88 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-27 17:23:40 +0100
  • f8d653406a Add the new content for the default pad and add french translation yflory 2017-02-27 17:23:28 +0100
  • d15a08830e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-27 14:32:04 +0100
  • 06f0891d21 add allowUserFeedback toggle to settigs page ansuz 2017-02-27 14:31:56 +0100
  • 4941674cf7 initialize allowUserFeedback to true if it is not defined ansuz 2017-02-27 14:31:00 +0100
  • 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-27 14:29:55 +0100
  • 95853debf9 Update the default pad #1 yflory 2017-02-27 14:29:48 +0100
  • d4bf7cf9aa Send the initial state only if it is a new pad in /pad yflory 2017-02-27 14:29:38 +0100
  • 66dc166936 Make sure the realtime is synced with onSettle when using cryptget yflory 2017-02-27 14:28:12 +0100
  • fadddb297c Readonly mode in /pad had contenteditable set to true yflory 2017-02-27 12:41:29 +0100
  • de5a21fe57 add a simple feedback api and text explaining what it is ansuz 2017-02-27 12:06:49 +0100
  • 2ad9debe58 Remove the placeholders in /code and /slide yflory 2017-02-27 11:45:23 +0100
  • 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error yflory 2017-02-27 11:19:29 +0100
  • 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-24 18:55:48 +0100
  • 5303e76ece Make sure the content is correctly applied in onReady yflory 2017-02-24 18:55:41 +0100
  • cc829d51f8 jshint compliance ansuz 2017-02-24 18:23:43 +0100
  • 42b6cca18d Fix new pad not working yflory 2017-02-24 16:55:43 +0100
  • 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive yflory 2017-02-24 16:51:15 +0100
  • 02cc9c8344 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-24 16:18:54 +0100
  • e040c00557 Fix blocker issue when creating an account without migrating yflory 2017-02-24 16:18:41 +0100
  • e15a6a347f Fix the forget pad button yflory 2017-02-24 15:22:26 +0100
  • 89bee8cf6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-24 12:08:26 +0100
  • ba3e24b595 media tag experiments ansuz 2017-02-24 12:08:16 +0100
  • 9ccb473b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability ansuz 2017-02-24 12:06:17 +0100
  • 252fc7a640 uppercase messages ansuz 2017-02-24 11:52:21 +0100
  • 54b0a86c2e Make sure we redirect to the drive if we access the login page from the homepage yflory 2017-02-24 11:44:47 +0100
  • 55fb0f03ae Fix the path in the drive overriding the content area yflory 2017-02-24 11:01:33 +0100
  • d7d7165dc4 Login page was using a wrong translation key yflory 2017-02-23 18:19:33 +0100
  • ba0b314f5e Fix the 'new' button in drive which was broken in non root categories yflory 2017-02-23 18:15:44 +0100
  • d8cc2903cc Display context menu actions in the toolbar when an element is selected yflory 2017-02-23 17:25:25 +0100
  • 20689b1dec update english translation for usability feedback ansuz 2017-02-23 16:11:39 +0100
  • a0340f1419 Open link in a new tab in /pad yflory 2017-02-23 14:27:18 +0100
  • 2d30393243 Add support for updated translation key yflory 2017-02-23 11:45:00 +0100
  • f168433db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-22 17:41:06 +0100
  • d0b7576d84 make slide present mode exit button clickable at all sizes ansuz 2017-02-22 17:40:44 +0100
  • cc174f3bee Fix typo yflory 2017-02-22 12:26:25 +0100
  • bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-22 12:25:48 +0100
  • 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) yflory 2017-02-22 12:25:29 +0100
  • 1494387c9f ignore a line for jshint ansuz 2017-02-22 11:17:12 +0100
  • e73b4a1131 Don't display 'All files' in the menu yflory 2017-02-22 11:15:29 +0100