Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 796bf89491 Update of the front-page CatalinScr 2017-07-24 17:56:54 +03:00
• 4f63921fc9 better width styling on list. lint compliance ansuz 2017-07-24 16:36:53 +02:00
• 35635c3e2f CSS fix for the todo app yflory 2017-07-24 16:27:35 +02:00
• 3efb9d21f5 pull in bootstrap. submit form on enter ansuz 2017-07-24 16:22:12 +02:00
• 83f79a3883 slightly better styles ansuz 2017-07-24 16:14:49 +02:00
• 180e643af9 Style of Todo App Nicolas Lemoine 2017-07-24 16:29:39 +03:00
• 5083299e8a Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo Nicolas Lemoine 2017-07-24 16:23:59 +03:00
• f67fb32bf1 Add, delete, display a task in Todo Nicolas Lemoine 2017-07-24 16:23:53 +03:00
• 56514d7e17 add val api ansuz 2017-07-24 15:10:15 +02:00
• ac718b6dfa Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo Nicolas Lemoine 2017-07-24 15:35:45 +03:00
• a61faebb2b App Todo - Init and HTML Nicolas Lemoine 2017-07-24 15:35:29 +03:00
• 522476a2a6 initialize data model and provide basic methods ansuz 2017-07-24 14:30:43 +02:00
• 4345fc0662 Todo app yflory 2017-07-24 14:13:47 +02:00
• 49c760131e wip Caleb James DeLisle 2017-07-24 14:10:40 +02:00
• e3b9c03fc0 TodoApp - Init Nicolas Lemoine 2017-07-23 16:28:49 +03:00
• 658b00814b TodoApp - Style and translations Nicolas Lemoine 2017-07-23 16:08:49 +03:00
• a9a65e4ca9 remove unused code ansuz 2017-07-23 14:36:41 +02:00
• 4b53e02f6c oups ansuz 2017-07-23 14:32:13 +02:00
• 2e3be27278 resolve merge ansuz 2017-07-23 14:31:13 +02:00
• 2e8e44933a Fixed spelling error in Spanish translation c4rl0sc 2017-07-23 14:31:12 +02:00
• dcf5719eaf handle most of the boilerplate stuff ansuz 2017-07-23 14:27:47 +02:00
• 0d43a84c2b move example into another folder ansuz 2017-07-23 14:19:43 +02:00
• 064e189495 Fixed spelling issues and improved translation quality. c4rl0sc 2017-07-23 14:16:34 +02:00
• 5c07eac4de Change title and footer Nicolas Lemoine 2017-07-23 15:08:27 +03:00
• f5454f232a pull in todomvc vanillajs example ansuz 2017-07-23 13:46:41 +02:00
• ae693ff5a7 lint compliance ansuz 2017-07-23 09:01:12 +02:00
• 6a1ec54e2a wip Caleb James DeLisle 2017-07-22 17:31:40 +02:00
• dc9565f22f make buttons colorful Pierre Bondoerffer 2017-07-22 17:30:13 +02:00
• 8404017af1 wip Caleb James DeLisle 2017-07-22 16:43:53 +02:00
• 76e69f0ba8 Merge pull request #127 from gustavohmsilva/master ansuz 2017-07-22 16:07:44 +02:00
• 52fa77e961 Merge pull request #157 from MacLemon/reduce-image-asset-size ansuz 2017-07-22 16:00:12 +02:00
• 6d1e785a4b Merge pull request #158 from MacLemon/improve-german-localisation ansuz 2017-07-22 15:58:17 +02:00
• 6785f166fd Merge branch 'master' into master Gustavo H M Silva 2017-07-22 09:18:12 -03:00
• 6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-22 14:15:15 +02:00
• 55cb0734e2 make bad state timeout configurable ansuz 2017-07-22 10:56:39 +02:00
• 25cba8bba3 Translated missing out.presentSuccess to german MacLemon 2017-07-20 20:08:30 +02:00
• 29bfcfa719 File size reduction and optimization of new image assets MacLemon 2017-07-20 20:03:26 +02:00
• 469f49fc0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-20 18:32:12 +02:00
• a80b00a765 Move the file picker in common yflory 2017-07-20 18:32:03 +02:00
• d44f0696af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-20 18:24:53 +02:00
• 2d0635a409 use custom version of tippy ansuz 2017-07-20 18:23:51 +02:00
• 09793e0d7d jshint yflory 2017-07-20 18:21:10 +02:00
• 683769f30a Fix tooltips yflory 2017-07-20 18:19:59 +02:00
• 9633025afe CSS for the removeHistory button in contacts yflory 2017-07-20 17:26:33 +02:00
• 97f1bbedc5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-20 17:08:28 +02:00
• b9bba76b4e Make the delay for tooltips configurable yflory 2017-07-20 17:08:11 +02:00
• dd98e2222a WIP erase chat history button ansuz 2017-07-20 17:04:11 +02:00
• 128d5b2c6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-20 15:55:17 +02:00
• b22127f10c add history removal ansuz 2017-07-20 15:55:04 +02:00
• a5a73ce326 Fix print button in slide yflory 2017-07-20 14:41:51 +02:00
• a79d9d3e66 Make CryptDrive fast again yflory 2017-07-19 11:36:00 +02:00
• ffb5e555a0 Merge branch 'staging' into front-page Caleb James DeLisle 2017-07-20 10:09:32 +02:00
• 3bd5f01e53 Fix slide ratio in preview mode yflory 2017-07-20 09:55:18 +02:00
• 140964478e Enter + shift key to add a new line in chat yflory 2017-07-20 09:54:44 +02:00
• 331b4dddea Clean debugging code yflory 2017-07-19 17:50:08 +02:00
• e26e041a5b fix jshint errors yflory 2017-07-19 17:24:35 +02:00
• c33d2a2db0 New tooltips yflory 2017-07-19 17:14:10 +02:00
• 88813aee02 Show that only html can be imported in pads yflory 2017-07-19 16:36:10 +02:00
• b56a782f01 Store the userlist state when it is closed using the icon yflory 2017-07-19 14:38:46 +02:00
• 82c87144cb Remove the friend request button when the request is sent yflory 2017-07-19 14:14:34 +02:00
• 5ce49af57b Make CryptDrive fast again yflory 2017-07-19 11:36:00 +02:00
• 1dc98dcff1 CSS for the contacts input field yflory 2017-07-19 10:30:38 +02:00
• e2d031c76a Add support for markdown syntax in contacts yflory 2017-07-19 10:29:59 +02:00
• cba113a2b0 Lint yflory 2017-07-18 15:52:46 +02:00
• 91ebbdfdb4 View contact status yflory 2017-07-18 15:50:21 +02:00
• 221a3b4fed Fix duplicate leftside entries when disconnected in profile yflory 2017-07-18 12:10:58 +02:00
• 22a28a8fd9 Fix undefined description in profile yflory 2017-07-18 11:49:54 +02:00
• 26fa914982 Missing translation keys yflory 2017-07-18 11:06:50 +02:00
• 39fd0d0f5f notify if you're focused on a conversation in a bacgkrounded tab ansuz 2017-07-18 10:57:37 +02:00
• b2de6ac28e Merge pull request #156 from pbondoer/spanish ansuz 2017-07-18 10:55:03 +02:00
• 7540f12040 Fix profile creation button not centered yflory 2017-07-18 10:45:36 +02:00
• f719b34e09 Add tab notification in contacts yflory 2017-07-18 10:42:23 +02:00
• a2c2e98060 Spanish update Pierre Bondoerffer 2017-07-18 10:30:28 +02:00
• 6aab1c94b2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-18 10:24:00 +02:00
• baf439648e Add the contacts app in the dropdown menu yflory 2017-07-18 10:22:51 +02:00
• 36d792874a Fix initial text not removed in /contacts yflory 2017-07-18 10:13:04 +02:00
• 5716f76c91 fix typo in translations ansuz 2017-07-18 10:04:02 +02:00
• 3545a66320 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-17 18:51:40 +02:00
• 743b87b70f Add initial text in /contacts yflory 2017-07-17 18:51:23 +02:00
• df0442c2bf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-17 18:40:27 +02:00
• eb4b5ca77c stub history removal. coming soon ansuz 2017-07-17 18:39:44 +02:00
• aa8181ab2b Contacts app translations yflory 2017-07-17 18:34:46 +02:00
• 73e32f273e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-17 18:08:07 +02:00
• 009d01abde Fix friend removal and update user data yflory 2017-07-17 18:07:58 +02:00
• 0cd94e2ba8 add title to contacts app ansuz 2017-07-17 17:38:41 +02:00
• f2320190b8 change friends url to /contacts/ ansuz 2017-07-17 17:18:28 +02:00
• a28a59abf0 harden server further against bad channel ids ansuz 2017-07-17 16:34:47 +02:00
• 06c971ec47 s/friend/contact/g ansuz 2017-07-17 15:52:13 +02:00
• 756b561bbc lint compliance ansuz 2017-07-17 14:12:30 +02:00
• 2e0aa185cd uppercase first letter of new translation keys ansuz 2017-07-17 14:12:05 +02:00
• 6306de5265 set avatar border-radius to 4px ansuz 2017-07-17 13:43:51 +02:00
• c452f25414 stub invite app ansuz 2017-07-17 11:56:34 +02:00
• 1aecdeb075 fresh media tag build ansuz 2017-07-17 11:08:39 +02:00
• 33dcd2ae28 drop black border from avatars in userlist ansuz 2017-07-17 11:08:20 +02:00
• 7114bfaa52 lint compliance ansuz 2017-07-13 21:09:29 +02:00
• 9ef45fe9f1 add background-color to names in chat ansuz 2017-07-13 18:04:56 +02:00
• e2c17dbeb4 resolve conflicts ansuz 2017-07-13 17:52:00 +02:00
• 0340b45f2c migrate profile to include edKey. don't propose connecting to users with whom you are already friends ansuz 2017-07-13 17:45:13 +02:00
• 557f13f796 Unfriend and update username - beta yflory 2017-07-13 17:32:57 +02:00
• b295aaa6c7 harden clearChannel implementation ansuz 2017-07-13 17:28:07 +02:00