Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 20518a3e88 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-27 17:23:40 +01:00
• f8d653406a Add the new content for the default pad and add french translation yflory 2017-02-27 17:23:28 +01:00
• d15a08830e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-27 14:32:04 +01:00
• 06f0891d21 add allowUserFeedback toggle to settigs page ansuz 2017-02-27 14:31:56 +01:00
• 4941674cf7 initialize allowUserFeedback to true if it is not defined ansuz 2017-02-27 14:31:00 +01:00
• 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-27 14:29:55 +01:00
• 95853debf9 Update the default pad #1 yflory 2017-02-27 14:29:48 +01:00
• d4bf7cf9aa Send the initial state only if it is a new pad in /pad yflory 2017-02-27 14:29:38 +01:00
• 66dc166936 Make sure the realtime is synced with onSettle when using cryptget yflory 2017-02-27 14:28:12 +01:00
• fadddb297c Readonly mode in /pad had contenteditable set to true yflory 2017-02-27 12:41:29 +01:00
• de5a21fe57 add a simple feedback api and text explaining what it is ansuz 2017-02-27 12:06:49 +01:00
• 2ad9debe58 Remove the placeholders in /code and /slide yflory 2017-02-27 11:45:23 +01:00
• 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error yflory 2017-02-27 11:19:29 +01:00
• 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-24 18:55:48 +01:00
• 5303e76ece Make sure the content is correctly applied in onReady yflory 2017-02-24 18:55:41 +01:00
• cc829d51f8 jshint compliance ansuz 2017-02-24 18:23:43 +01:00
• 42b6cca18d Fix new pad not working yflory 2017-02-24 16:55:43 +01:00
• 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive yflory 2017-02-24 16:51:15 +01:00
• 02cc9c8344 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-24 16:18:54 +01:00
• e040c00557 Fix blocker issue when creating an account without migrating yflory 2017-02-24 16:18:41 +01:00
• e15a6a347f Fix the forget pad button yflory 2017-02-24 15:22:26 +01:00
• 89bee8cf6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-24 12:08:26 +01:00
• ba3e24b595 media tag experiments ansuz 2017-02-24 12:08:16 +01:00
• 9ccb473b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability ansuz 2017-02-24 12:06:17 +01:00
• 252fc7a640 uppercase messages ansuz 2017-02-24 11:52:21 +01:00
• 54b0a86c2e Make sure we redirect to the drive if we access the login page from the homepage yflory 2017-02-24 11:44:47 +01:00
• 55fb0f03ae Fix the path in the drive overriding the content area yflory 2017-02-24 11:01:33 +01:00
• d7d7165dc4 Login page was using a wrong translation key yflory 2017-02-23 18:19:33 +01:00
• ba0b314f5e Fix the 'new' button in drive which was broken in non root categories yflory 2017-02-23 18:15:44 +01:00
• d8cc2903cc Display context menu actions in the toolbar when an element is selected yflory 2017-02-23 17:25:25 +01:00
• 20689b1dec update english translation for usability feedback ansuz 2017-02-23 16:11:39 +01:00
• a0340f1419 Open link in a new tab in /pad yflory 2017-02-23 14:27:18 +01:00
• 2d30393243 Add support for updated translation key yflory 2017-02-23 11:45:00 +01:00
• f168433db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-22 17:41:06 +01:00
• d0b7576d84 make slide present mode exit button clickable at all sizes ansuz 2017-02-22 17:40:44 +01:00
• cc174f3bee Fix typo yflory 2017-02-22 12:26:25 +01:00
• bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-22 12:25:48 +01:00
• 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) yflory 2017-02-22 12:25:29 +01:00
• 1494387c9f ignore a line for jshint ansuz 2017-02-22 11:17:12 +01:00
• e73b4a1131 Don't display 'All files' in the menu yflory 2017-02-22 11:15:29 +01:00
• 33e2c8676e assign updated key to what it should actually be ansuz 2017-02-22 11:15:25 +01:00
• 89f3577058 remove old poll ansuz 2017-02-22 11:05:47 +01:00
• 641c805518 unbreak ckeditor ansuz 2017-02-21 18:59:42 +01:00
• 7e77c6828a more correct pluralization ansuz 2017-02-21 18:55:48 +01:00
• fac5a043ca Merge pull request #88 from pbondoer/staging ansuz 2017-02-21 18:54:09 +01:00
• e5179a1b3f Translate pad initial state in french yflory 2017-02-21 18:48:01 +01:00
• 328e3e71d9 Some UI fixes for Spanish Pierre Bondoerffer 2017-02-21 18:47:32 +01:00
• 2e378564d0 Make the 'pad' initial state translatable yflory 2017-02-21 18:43:26 +01:00
• c0989f64fa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-21 18:21:39 +01:00
• 3d0e7cb9a7 pull ckeditor config out of main.js ansuz 2017-02-21 18:21:30 +01:00
• 81fbe0fdd1 Add back some translation keys that shouldn't have been removed yflory 2017-02-21 18:21:11 +01:00
• f08d43d2a0 Slight fixup Pierre Bondoerffer 2017-02-21 18:02:12 +01:00
• fc2aac2d1b Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging Pierre Bondoerffer 2017-02-21 18:00:27 +01:00
• 1438f6b84b Update Spanish translation 🇪🇸 Pierre Bondoerffer 2017-02-21 17:56:02 +01:00
• 328e5c6f03 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-21 17:43:05 +01:00
• c72bbd4c37 Use the file name as initial title yflory 2017-02-21 17:42:58 +01:00
• ed19c6885d join array in messages.js ansuz 2017-02-21 17:16:56 +01:00
• 22f926d3a5 Merge pull request #87 from pbondoer/staging ansuz 2017-02-21 15:01:03 +01:00
• 4cbb3b2ed2 Ensure we use English for reference Pierre Bondoerffer 2017-02-21 14:53:18 +01:00
• ffe17a6bc9 Use JSON.stringify instead and fix linter Pierre Bondoerffer 2017-02-21 14:37:08 +01:00
• a84f8e2808 Assert translation now outputs JavaScript which is easier to edit for translators Pierre Bondoerffer 2017-02-21 14:23:58 +01:00
• 20b08a7847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-21 14:16:35 +01:00
• 47b8fefd9e Load messages.js only once, in cryptpad-common yflory 2017-02-21 14:16:23 +01:00
• 5276dac7cc safely handle keys which aren't strings ansuz 2017-02-21 12:29:47 +01:00
• 84b64da76d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-21 12:22:09 +01:00
• b55ded454b Update README #2 yflory 2017-02-21 11:13:10 +01:00
• f17b84d7e9 Update README about translations yflory 2017-02-21 11:11:38 +01:00
• 1151c02662 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-02-21 10:58:28 +01:00
• 3b71c8b0b5 Missing translations are now returned as an array of arrays yflory 2017-02-21 10:53:30 +01:00
• 11d9c9e813 Merge branch 'master' into staging yflory 2017-02-21 10:44:03 +01:00
• 2103f0afa8 Merge branch 'master' of github.com:xwiki-labs/cryptpad yflory 2017-02-21 10:42:35 +01:00
• 0bdf59c1dd Fix broken link in the 'New' button on cryptpad.fr yflory 2017-02-21 10:42:06 +01:00
• 454d1c2052 Do not load all the translations anymore, only the needed one yflory 2017-02-20 18:29:06 +01:00
• 434c3a220c Remove old translation keys #2 yflory 2017-02-20 16:15:13 +01:00
• d81d17b86c Remove old translations keys no longer used yflory 2017-02-17 17:39:27 +01:00
• 9702305abc Use better translation keys in settings yflory 2017-02-17 17:38:51 +01:00
• a6497f7a52 Add a way to show the drive tips again yflory 2017-02-17 16:56:59 +01:00
• c17f28e5fe Fix race condition #2 yflory 2017-02-17 15:39:34 +01:00
• 38122d7785 Merge branch 'soon' yflory 2017-02-17 15:26:01 +01:00
• 239e2bcc1f Fix issue with null entries in Cryptpad_RECENTPADS yflory 2017-02-17 15:16:30 +01:00
• 1540ae3f6f Fix issue with null entries in Cryptpad_RECENTPADS yflory 2017-02-17 15:16:30 +01:00
• dd014f6ef2 Fix race conditon yflory 2017-02-17 15:16:03 +01:00
• 94417d9a8b jshint compliance ansuz 2017-02-17 14:28:18 +01:00
• 8167ed9048 implement cache-busting everywhere ansuz 2017-02-17 12:38:10 +01:00
• 34b6507fa3 implement cache-busting everywhere ansuz 2017-02-17 12:38:10 +01:00
• 66a21bb45c implement cache-busting everywhere ansuz 2017-02-17 12:38:10 +01:00
• c9b8889380 add cache-busting to chainpad-crypto ansuz 2017-02-17 11:25:35 +01:00
• 09fade6127 add cache-busting to chainpad-crypto ansuz 2017-02-17 11:25:35 +01:00
• 2daa9f8658 Link to main page was opened in the inner iframe yflory 2017-02-17 10:57:56 +01:00
• deda40375a Use the new onSettle from chainpad to determine if the realtime is synced yflory 2017-02-17 10:31:07 +01:00
• c62e0f8be0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-16 18:11:28 +01:00
• 550c65aae0 Add a default pad in CryptDrive after signing up yflory 2017-02-16 17:22:45 +01:00
• b4128ee313 Fix typo yflory 2017-02-16 17:26:51 +01:00
• 4243d9028e new version of chainpad, update all the dependencies Caleb James DeLisle 2017-02-16 17:24:26 +01:00
• 85fe67618c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-02-16 16:50:26 +01:00
• c8587a967a Use new version of chainpad Caleb James DeLisle 2017-02-16 16:50:02 +01:00
• 92d50ded64 Merge branch 'soon' into staging yflory 2017-02-16 16:48:12 +01:00
• 97762f9f9a Make sure all the elements in RECENTPADS are non-null objects yflory 2017-02-16 16:07:43 +01:00
• e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name yflory 2017-02-16 15:35:03 +01:00
• 7762ffcbff Ability to use Ctrl+click on the cryptpad logo in apps yflory 2017-02-15 18:31:36 +01:00