Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 636b0fcadc do our best to keep the console quiet ansuz 2016-11-02 12:09:41 +01:00
• 5c53f172a1 Merge pull request #55 from xwiki-labs/soon ansuz 2016-10-28 18:02:09 +02:00
• 3de4e5709b Clean the code yflory 2016-10-26 17:50:59 +02:00
• ab1d3958ce Add a pencil icon when hovering the title yflory 2016-10-26 17:49:16 +02:00
• 64346b72d8 Change the height of the toolbar top line yflory 2016-10-26 15:14:47 +02:00
• 6d1e06cca3 Add notifications when a user joins or leaves the channel yflory 2016-10-26 15:02:30 +02:00
• 54a63267cd Add a share button and merge the viewers and editors buttons yflory 2016-10-25 18:34:23 +02:00
• 87d86384ac Fix broken elements in the new toolbar yflory 2016-10-25 17:29:13 +02:00
• 6351d1856f Remove the top bar and move its content in the applications' toolbars yflory 2016-10-25 15:22:35 +02:00
• 3d74290c7d Merge branch 'usability5' into staging yflory 2016-10-24 18:33:10 +02:00
• 9e92a597b3 Ability to edit the title in the toolbar by clicking it yflory 2016-10-24 18:32:43 +02:00
• 0a9d34a6c9 hide appended color pickers ansuz 2016-10-24 15:29:46 +02:00
• 5dbd16a956 hide appended color pickers ansuz 2016-10-24 15:29:46 +02:00
• c858b247c1 filter absent users from the userlist ansuz 2016-10-24 15:11:19 +02:00
• ac3ddbab70 expose userList for later usage ansuz 2016-10-24 15:10:49 +02:00
• a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging ansuz 2016-10-24 14:54:35 +02:00
• 901a708be6 Merge branch 'usability1' of github.com:xwiki-labs/cryptpad into staging ansuz 2016-10-24 14:54:06 +02:00
• 2326526f95 correct grammatical error in French translation ansuz 2016-10-24 14:32:34 +02:00
• ef17dd66fa userButtonTitle to french translation. Thanks @yflory ansuz 2016-10-24 12:01:15 +02:00
• 841ded8fdc add translation completeness test to assertion page ansuz 2016-10-24 11:51:16 +02:00
• e07cb984e5 return, don't log ansuz 2016-10-24 11:47:13 +02:00
• 1785516f0e add spanish translations to map. export a function which checks completion of translations ansuz 2016-10-24 11:41:36 +02:00
• 02c0790dd6 export messages ansuz 2016-10-24 11:39:28 +02:00
• 7285e655c3 fix unterminated strings ansuz 2016-10-24 11:23:27 +02:00
• a846463328 change localization key back to france ansuz 2016-10-24 11:18:34 +02:00
• 8347ab8bc6 Merge branch 'master' of github.com:heticor915/cryptpad into espanol ansuz 2016-10-24 10:37:51 +02:00
• 5b7d3f9d57 Add spanish translation Hector F. Jimenez 2016-10-21 16:36:41 -05:00
• 10bb5e1607 Add the title in the toolbar Yann Flory 2016-10-21 18:16:27 +02:00
• 1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad Yann Flory 2016-10-21 15:17:15 +02:00
• 5d9b81ab2f Merge pull request #53 from xwiki-labs/update ansuz 2016-10-20 11:54:29 +02:00
• e23ac85b6d use absolute path to css ansuz 2016-10-20 11:30:36 +02:00
• 78f8286fe3 add a note about installing storage adaptors from npm ansuz 2016-10-20 11:29:26 +02:00
• 46c5f64369 remove absent users from the userlist ansuz 2016-10-19 12:30:25 +02:00
• a98f8944d6 Merge pull request #52 from xwiki-labs/fixTranslations ansuz 2016-10-18 14:07:21 +02:00
• 51a79c5218 Remove unused dependency yflory 2016-10-18 13:38:48 +02:00
• f5fbebfcc9 Fix small issues with the french translation yflory 2016-10-18 13:37:51 +02:00
• 8eea58ecdd Merge pull request #51 from xwiki-labs/config-http-headers ansuz 2016-10-18 11:54:54 +02:00
• 2f9283a677 fix leaky global variable ansuz 2016-10-18 11:51:35 +02:00
• a2e5c96115 make http headers configurable, update default conf ansuz 2016-10-18 11:48:29 +02:00
• 9a733bb360 Fix dropdown menus with Edge yflory 2016-10-13 15:00:53 +02:00
• 4378df25b8 Merge branch 'css' into soon yflory 2016-10-13 14:26:43 +02:00
• 39bbf8a6c1 Fix the new userlist button and make the toolbar responsive yflory 2016-10-13 14:24:44 +02:00
• 24fbe22c9d Improve the toolbar style and the way the userlist is displayed yflory 2016-10-12 18:40:26 +02:00
• 0fe62f8c75 make wss CSP headers configurable again ansuz 2016-10-12 13:03:36 +02:00
• 40bac1df55 Merge branch 'sandbox-frame' of https://github.com/cjdelisle/cryptpad into csp ansuz 2016-10-12 11:55:51 +02:00
• 1f2e45d6c8 improved fs storage adaptor and config docs ansuz 2016-10-12 10:52:27 +02:00
• 22464af6a5 fix reference to incorrect config flag ansuz 2016-10-12 10:39:46 +02:00
• d2389a5729 Change the userlist in the toolbar yflory 2016-10-11 18:39:43 +02:00
• e739c49e7f Remove the 'about' button in ckeditor yflory 2016-10-11 11:57:07 +02:00
• b23fe783e3 Fix the color picker in Chrome and hide the buttons when not supported yflory 2016-10-10 18:21:18 +02:00
• 91b4446c0b Merge branch 'fix-chrome-style-bug' into soon yflory 2016-10-10 17:07:50 +02:00
• 53fe002d3b Merge branch 'slide' into soon yflory 2016-10-10 17:06:39 +02:00
• 6c04b7967d Remove unused library yflory 2016-10-10 17:03:25 +02:00
• d63c912af0 Use the HTML5 color picker to change the colors in slides yflory 2016-10-10 17:01:04 +02:00
• bb2317d8e6 fix chrome style bug by forcing reload of style sheet ansuz 2016-10-07 17:41:52 +02:00
• 765498e88e Remove the support for old.cryptpad.fr yflory 2016-10-07 10:39:48 +02:00
• d7e170c797 Test colorpicker yflory 2016-10-07 10:31:36 +02:00
• 72fc2e7068 Chuck a few more super-duper-security headers in there Caleb James DeLisle 2016-10-06 23:02:30 +02:00
• f8ac3a6ad3 Fix merge error Caleb James DeLisle 2016-10-06 22:48:30 +02:00
• 83c3f6310a Don't make the codestyle any worse than it is Caleb James DeLisle 2016-10-06 22:44:58 +02:00
• 12cdd1e76b Add a Content Security Policy which works for CryptPad Caleb James DeLisle 2016-10-06 22:37:25 +02:00
• 81fce1237f Colorpicker to choose the background color in present mode Yann Flory 2016-10-06 18:04:35 +02:00
• 5300bc363c Fix a race condition in the slide application yflory 2016-10-05 18:26:32 +02:00
• c322aa440e Fix the username icon hcih was not working anymore yflory 2016-10-05 18:19:52 +02:00
• 8575f3f79f Fix the "rename" feature which was not working anymore in some cases yflory 2016-10-05 17:22:42 +02:00
• a989b51d74 Fix race conditions with Alertify yflory 2016-10-05 16:04:21 +02:00
• 74df38f94f Fix race conditions that could prevent applications from being loaded yflory 2016-10-05 11:19:18 +02:00
• 7d5a33512a enable slide application listing on home page by default ansuz 2016-10-04 17:15:09 +02:00
• a28daf2715 use websocket url configuration api ansuz 2016-10-04 17:13:15 +02:00
• dbc8f01b8b fix merge errors and reach full jshint compliance ansuz 2016-10-04 16:58:10 +02:00
• a30e17121d Merge branch 'readonlyButton' into soon yflory 2016-10-04 15:48:52 +02:00
• e84a54556c Move the toolbar buttons' events handlers in cryptpad-common yflory 2016-10-04 15:44:12 +02:00
• 2ac1b02572 Merge branch 'config-sockets' into soon ansuz 2016-10-04 14:38:50 +02:00
• 61dfca33a3 resolve conflict and merge 'newserver' ansuz 2016-10-04 12:43:14 +02:00
• ee88e96baf merge noscript ansuz 2016-10-04 11:42:06 +02:00
• 11f63c861c Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title ansuz 2016-10-04 11:23:04 +02:00
• e1512a4063 Merge branch 'safe-sockets' into soon ansuz 2016-10-04 10:59:09 +02:00
• 5e76194262 use new config api ansuz 2016-10-03 19:28:36 +02:00
• 0ece2cf6a1 add to default configuration and comment ansuz 2016-10-03 19:28:14 +02:00
• 3dfa19b786 more flexible websocket configuration (WIP) ansuz 2016-10-03 19:19:38 +02:00
• 76fdadee7f Store only the strongest hash in the localstorage yflory 2016-10-03 18:23:59 +02:00
• 1c808b3da8 Add comment for the 'important' css rule yflory 2016-10-03 16:09:59 +02:00
• 17b4f91810 Do not share the title in the doc if it is the default title yflory 2016-10-03 16:05:39 +02:00
• 9fa7da60b9 confirm that a socket is ready to send before sending ansuz 2016-10-03 15:38:42 +02:00
• 0f672f19f5 Merge branch 'slide' into soon yflory 2016-10-03 14:31:58 +02:00
• 391728ee6d Use CodeMirror in /slide #2 yflory 2016-10-03 14:21:39 +02:00
• 8c33218ceb Move the codemirror themes in /common yflory 2016-10-03 14:19:37 +02:00
• 2609af2105 Use the CodeMirror editor in the slide application Yann Flory 2016-09-30 17:39:16 +02:00
• 4b238de84c quieter stdout and stderr logs ansuz 2016-09-30 15:51:23 +02:00
• b5b0eacebc Remove the old (non-bower) codemirror yflory 2016-09-29 16:24:26 +02:00
• 261d2fecbc Get codemirror from bower and use that version in the code app yflory 2016-09-29 16:23:27 +02:00
• bc73fa2074 Merge branch 'fontawesome' into soon yflory 2016-09-29 14:52:48 +02:00
• 921ee128bc deobfuscate email ansuz 2016-09-29 14:46:32 +02:00
• ebae2c3bec Fix the noscript tag yflory 2016-09-29 11:09:06 +02:00
• f03018f3bc Improve the top bar and use the font awesome icons in /code yflory 2016-09-28 15:28:25 +02:00
• 0be8c333e0 Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome ansuz 2016-09-28 09:01:33 +02:00
• 3d54413343 Improve the UI with FontAwesome icons yflory 2016-09-27 18:33:03 +02:00
• f8b65be009 Merge pull request #39 from ochronus/fix-content-type ansuz 2016-09-27 12:19:08 +02:00
• c82abd8780 reverting the style changes Csaba Okrona 2016-09-27 12:17:38 +02:00
• 08064ae035 Using express.static instead of custom handler Csaba Okrona 2016-09-27 11:53:52 +02:00