web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • f0f94ab180 Merge pull request #95 from pbondoer/staging ansuz 2017-03-02 18:46:36 +01:00
  • 616d265b8d Remove unused French keys Pierre Bondoerffer 2017-03-02 18:43:06 +01:00
  • 30faef613a Update Spanish Pierre Bondoerffer 2017-03-02 18:41:14 +01:00
  • 3b578aa1fd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-03-02 18:31:38 +01:00
  • f313b6f65c bump travis node version to 6.6.0 ansuz 2017-03-02 18:31:24 +01:00
  • 153386a6e0 CSS improvements in the drive tree yflory 2017-03-02 18:24:18 +01:00
  • 6098f28260 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-03-02 18:16:20 +01:00
  • a852112808 Fix open folder from the tree context menu yflory 2017-03-02 18:16:16 +01:00
  • 2c9deed381 Merge pull request #94 from pbondoer/staging ansuz 2017-03-02 18:15:30 +01:00
  • 868161a8a8 fix undefined reference in code ansuz 2017-03-02 17:45:48 +01:00
  • 0bb10a8a0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-03-02 17:59:35 +01:00
  • aec781c22f don't try to lint the server because ES6 ansuz 2017-03-02 17:46:38 +01:00
  • bbf8933646 fix undefined reference in code ansuz 2017-03-02 17:45:48 +01:00
  • 800db07077 Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-02 17:44:29 +01:00
  • e1303a16da add support for title attributes on dropdowns ansuz 2017-03-02 17:40:29 +01:00
  • 52793385ea Fix lint errors yflory 2017-03-02 17:17:55 +01:00
  • e39fe1c0b7 Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-02 17:09:39 +01:00
  • 01c4d7d4a7 Merge branch 'maybe' into staging ansuz 2017-03-02 17:09:06 +01:00
  • c884782d57 here are some changes ansuz 2017-03-02 17:08:50 +01:00
  • 2b6e44189d When trying to reset the drive, tell the user if the input text is invalid yflory 2017-03-02 17:01:27 +01:00
  • 9a7c2dd5e2 Add a 'settings' link to the user menu in static pages yflory 2017-03-02 16:38:22 +01:00
  • e8a82c4c10 (CSS) Toolbar buttons are now always black on white independent of system theme Pierre Bondoerffer 2017-03-02 16:35:30 +01:00
  • fa59f1000e (CSS) Fix title input in pads Pierre Bondoerffer 2017-03-02 16:33:17 +01:00
  • 584adb5482 bump version to 1.1.1 ansuz 2017-03-02 16:31:58 +01:00
  • 370ae81106 Use the display name in the backup file name if not logged in yflory 2017-03-02 16:29:17 +01:00
  • e0d972674f Fix context menu in drive and rename textbox styling Pierre Bondoerffer 2017-03-02 16:22:32 +01:00
  • c5f983ecd7 Convert read-only link to editing link in the drive yflory 2017-03-02 16:01:34 +01:00
  • d26d8f53d9 (CSS) Fixed textarea being too large Pierre Bondoerffer 2017-03-02 15:50:03 +01:00
  • 2b20eef464 Fix userlist in /pad yflory 2017-03-02 12:28:01 +01:00
  • a9afa24428 return empty string instead of blowing up when fixing HTML ansuz 2017-03-02 11:38:20 +01:00
  • e3f26263f4 remove red outline on images in slide ansuz 2017-03-02 11:28:20 +01:00
  • c9040997d5 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 ansuz 2017-03-02 11:07:17 +01:00
  • 6b8d0c8bc7 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 yflory 2017-03-02 10:53:48 +01:00
  • b32d698291 Fix issue with present mode in slide (readonly) yflory 2017-03-02 10:53:45 +01:00
  • 8bdc8415ab Find a pad in the drive yflory 2017-03-02 10:15:13 +01:00
  • 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it. Implement a "loader" which allows for applying a version number to everything. Added a cache control for anything which has a version. Caleb James DeLisle 2017-03-01 17:23:34 +01:00
  • 9800f036c5 fix a typo ansuz 2017-03-01 17:06:18 +01:00
  • 7db0e14bc0 add 'force' flag to override removal of html elements ansuz 2017-03-01 17:05:57 +01:00
  • b238f4c3d3 Merge pull request #93 from pbondoer/staging yflory 2017-03-01 16:33:23 +01:00
  • 53f4f8826e Merge branch 'staging' into staging yflory 2017-03-01 16:32:18 +01:00
  • 1bb87164f0 Merge branch 'soon' into staging yflory 2017-03-01 16:16:59 +01:00
  • 55210f17eb Clean the code to be less dependant on 'li' yflory 2017-03-01 16:15:48 +01:00
  • 3e9c4d0901 Add hover to file manager tree Pierre Bondoerffer 2017-03-01 15:57:22 +01:00
  • cbdfae09a6 Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-01 15:53:48 +01:00
  • c6c3e1bbb5 Don't select subfolders in the tree when drag&drop yflory 2017-03-01 15:53:31 +01:00
  • d605fc757b Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-01 15:46:49 +01:00
  • a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop yflory 2017-03-01 15:46:10 +01:00
  • cb5e01815c validate all alertify strings by default. require 'force' argument to bypass ansuz 2017-03-01 15:07:34 +01:00
  • b0323f6fd9 Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-03-01 14:45:18 +01:00
  • a2b5200381 Add a container for the folders in the tree in the drive yflory 2017-03-01 14:44:43 +01:00
  • bd42a7d176 bump hyperjson bower dependency to new major version ansuz 2017-03-01 14:36:41 +01:00
  • 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security yflory 2017-03-01 13:10:55 +01:00
  • 11d54256da Make sure the display name is displayed in the same way everywhere yflory 2017-03-01 13:10:06 +01:00
  • 2c5c6da0d9 Fix XSS in alertify logs yflory 2017-03-01 13:09:14 +01:00
  • 5797aab3f2 Fix XSS with display names in the user list yflory 2017-03-01 13:08:36 +01:00
  • 26e3971482 Fix XSS in the user dropdown menu yflory 2017-03-01 13:08:09 +01:00
  • 639376f1cb don't use hyperjson.toString ansuz 2017-03-01 12:36:10 +01:00
  • eb9a39eb68 Add hover on elements in drive and make grid slightly prettier Pierre Bondoerffer 2017-02-28 23:15:47 +01:00
  • 3619fdc77a bump cryptpad version number ansuz 2017-02-28 19:04:54 +01:00
  • 84a4a15c46 fix inverted checkbox description ansuz 2017-02-28 18:58:20 +01:00
  • e2acf15ed8 Merge pull request #91 from pbondoer/staging ansuz 2017-02-28 18:49:51 +01:00
  • f11b03c16e Spanish translation updated 🎉 Pierre Bondoerffer 2017-02-28 18:47:58 +01:00
  • f130fd0598 Fix horizontal scrollbar in edge yflory 2017-02-28 18:02:12 +01:00
  • 345d2faab2 Fix horizontal scrollbar in Edge #3 yflory 2017-02-28 17:13:51 +01:00
  • d683dc499a Fix horizontal scrollbar in Edge #2 yflory 2017-02-28 17:03:23 +01:00
  • 7a0a87bf6c Fix horizontal scrollbar in Edge yflory 2017-02-28 16:38:51 +01:00
  • 3bf85b113c don't hide overflow, that causes worse problems ansuz 2017-02-28 16:37:34 +01:00
  • f06196c261 Remove the context menu buttons when removing selection yflory 2017-02-28 15:48:49 +01:00
  • 65202bd619 Fix french translation with the drive readme yflory 2017-02-28 15:02:11 +01:00
  • c0278ba77f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 13:12:53 +01:00
  • efb7380a12 Fix default pad not created after registration yflory 2017-02-28 13:12:27 +01:00
  • 5d39125004 Make onSettle Async Again ansuz 2017-02-28 13:12:04 +01:00
  • 3380b13c95 remove horizontal scroll on edge ansuz 2017-02-28 12:29:53 +01:00
  • 10c41369de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-28 12:25:40 +01:00
  • 8c87255267 remove any mention of piwik ansuz 2017-02-28 12:25:31 +01:00
  • 8007f51655 Update french translation yflory 2017-02-28 12:01:32 +01:00
  • 1c7561f37e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 11:51:23 +01:00
  • 6967b67485 Update french translation suing new best practices yflory 2017-02-28 11:51:18 +01:00
  • 569d25f25f update some translation keys in English ansuz 2017-02-28 11:50:07 +01:00
  • b87c9d4ba6 fix merge conflicts with usability branch ansuz 2017-02-28 11:35:29 +01:00
  • 5a49e276b5 add settings_anonymous key ansuz 2017-02-28 11:32:14 +01:00
  • 4f4075ed6e Make the settings app available to anonymous users yflory 2017-02-28 11:23:50 +01:00
  • 0224d6489b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 11:06:50 +01:00
  • 12aec60a12 hack around onSettle not doing its job ansuz 2017-02-28 11:05:59 +01:00
  • 0ae7f94184 Remove the pointer and text underline on icon:hover in drive yflory 2017-02-28 10:50:52 +01:00
  • 69b6f80e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-28 10:47:23 +01:00
  • 86adfbf27d update cache-busting directive in all supported apps ansuz 2017-02-28 10:47:18 +01:00
  • cfc9f2e622 remove code for 'user' app, now that we have login and register ansuz 2017-02-28 10:46:21 +01:00
  • ec7761eeb8 Make sure we don't use a wrong title for a new pad yflory 2017-02-28 10:43:36 +01:00
  • 8e7e1d336e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-28 10:39:53 +01:00
  • 96f6b5755d Add the blog link in the header and footer yflory 2017-02-28 10:39:48 +01:00
  • d49a7d7ec4 fix undefined reference ansuz 2017-02-28 10:30:24 +01:00
  • ccd195d318 Translate user feedback keys in french yflory 2017-02-28 10:28:07 +01:00
  • 9a2ed5741a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-27 20:11:26 +01:00
  • a4913f2f4b provide UI for disabling the user feedback api ansuz 2017-02-27 20:11:18 +01:00
  • 1a259bb3aa check if user has disallowed feedback api ansuz 2017-02-27 20:02:54 +01:00
  • 4f7a05ead2 Fix issue with the path for the trash in the drive's topbar yflory 2017-02-27 18:37:44 +01:00
  • 8741b50f5b Set the file name as default title if a pad is created from the drive yflory 2017-02-27 18:15:18 +01:00
  • e8c73f35ce In the tree, display the rename input only once yflory 2017-02-27 17:50:58 +01:00
  • e38df7ce47 Fix creation of new pads in /pad yflory 2017-02-27 17:47:11 +01:00