Commit Graph

478 Commits (1245b4d2448d4227ce97e070f807564037975ef2)

Author SHA1 Message Date
yflory 204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 15:17:09 +02:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz 7d1892546b add missing french translation 2017-10-23 14:59:14 +02:00
ansuz 2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
yflory 3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
Yannick A 63dcfd6d18 Update French translation 2017-10-19 21:02:03 +02:00
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory 6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
Caleb James DeLisle 15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory 62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +02:00
yflory 50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +02:00
yflory c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 17:30:14 +02:00
yflory f4189f883e Add missing french translation keys 2017-10-09 17:28:56 +02:00
ansuz d046b9ce33 add missing French key 2017-10-09 17:16:48 +02:00
ansuz f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
yflory d3d6940b69 Update french translation for tags 2017-10-09 15:47:28 +02:00
ansuz 3f181fa370 update loading screen tip for tags 2017-10-09 15:38:33 +02:00
yflory dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02:00
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
yflory ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
yflory 1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
ansuz 080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +02:00
Caleb James DeLisle d9e97b86e6 Merge branch 'staging' into framework 2017-10-05 12:14:37 +03:00
yflory 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
ansuz e2f53eaddb add loading screen tip about hashtags 2017-10-03 18:39:03 +02:00
ansuz b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02:00
yflory 5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
Caleb James DeLisle 94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide 2017-10-03 12:10:16 +03:00
Caleb James DeLisle fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
yflory 95542bcdaf Lint 2017-09-19 15:38:19 +02:00
yflory 8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
yflory c00d295466 Add missing translations 2017-09-15 17:33:36 +02:00
ansuz e0ae0fcd91 thanks Dima! 2017-09-13 17:47:49 +02:00
yflory 8c3e2dbe61 Missing french translation keys 2017-09-12 11:45:47 +02:00
ansuz 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
yflory 37dca9c155 Add missing translation keys in french 2017-09-11 14:12:06 +02:00
yflory fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
ansuz bca9ba66cb enforce a configurable minimum password length when registering 2017-09-07 17:44:04 +02:00
yflory fe8b2c2556 Fix french translation 2017-09-06 15:43:30 +02:00
yflory 8f2776657b Add translations for pad embed 2017-09-06 11:21:53 +02:00
yflory 3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory 01881ac469 Update loading tips in the french translation 2017-09-05 15:15:57 +02:00
yflory 729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
ansuz 6bb29e52e2 lint compliance 2017-08-31 18:45:18 +02:00
CatalinScr 0ceb4cbbcb Updated the contact page with the new design 2017-08-31 16:26:20 +03:00
CatalinScr 83be769bb3 Merge branch 'master' into staging
updated with new version
2017-08-31 11:36:39 +03:00
CatalinScr f95f3f4f24 Updated the contact page 2017-08-31 10:04:40 +03:00
ansuz 2ef4ebc6ef two new tips for the loading screen 2017-08-29 17:56:34 +02:00