Commit Graph

488 Commits (a204740ac2ebfcfab2cccd5bd1d65f4bf114eb77)

Author SHA1 Message Date
ansuz bcdc0d810a make 404 page translateable, point to home page or drive 2017-12-01 11:51:04 +01:00
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
yflory 9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory ce3600b026 Update translation keys 2017-11-20 10:41:27 +01:00
yflory af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory 25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory 2ff66e1a7c Update french translation 2017-11-06 17:39:41 +01:00
ansuz 2c9df23849 update english text for removing from trash in the drive 2017-11-06 17:37:29 +01:00
ansuz d10f752457 s/delete/move to trash 2017-11-06 17:07:37 +01:00
yflory 2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory 1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
yflory 3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +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 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 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +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 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 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
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 2017-08-28 12:22:31 +02:00
ansuz f9cdbe66a0 add forgotten translation string 2017-08-24 17:20:59 +02:00
ansuz 48fe3ef841 add a tip about cryptdrive 2017-08-17 14:25:24 +02:00
ansuz 839c6df3bb remove invalid loading screen tips. create a new one 2017-08-17 14:16:37 +02:00
ansuz 7537caf8fe make footer translateable 2017-08-16 10:51:08 +02:00
ansuz 8ee5e14a60 merge ui-integration 2017-08-16 10:20:05 +02:00
CatalinScr fd3fd945c8 Updated the Log in Page 2017-08-16 07:56:18 +03:00
CatalinScr dd48cf7c90 updated the register page 2017-08-15 23:47:36 +03:00
Caleb James DeLisle 7c8df61f91 sed majik to switch 'What is CryptDrive' to 'What is CryptPad' 2017-08-11 17:54:15 +02:00
Caleb James DeLisle 9833bd7e59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-11 14:31:40 +02:00
Caleb James DeLisle 89a8e8050c Fix typo and also change message to explain itself better 2017-08-11 14:31:31 +02:00
ansuz 328107be4d translation key for using tabs 2017-08-11 14:26:08 +02:00
ansuz 958294f109 put code settings in their own tab 2017-08-11 13:00:50 +02:00
ansuz ae0b2ca1a8 add label for code indentation 2017-08-11 12:55:10 +02:00
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos 2017-08-11 11:32:21 +02:00
Pierre Bondoerffer baf64114a6
point to homepage in drive 2017-08-10 14:45:56 +02:00
Pierre Bondoerffer ca686f9c92
(hopefully) fix newline in lists when pasting links 2017-08-08 17:47:10 +02:00
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 2017-08-08 16:51:23 +02:00
Pierre Bondoerffer 2cc6c636db
Add some missing titles 2017-08-08 16:20:31 +02:00
Pierre Bondoerffer 355b7f1839
change recent to local pads 2017-08-08 12:05:22 +02:00
Caleb James DeLisle 0d1f19f5d4 Big manual merge 2017-08-04 11:20:17 +02:00
Caleb James DeLisle 52e9ba92fa Update whitepaper link and also change whatis_zeroknowledge 2017-08-03 16:23:29 +02:00
Pierre Bondoerffer cdf6345fc1
use sign up 2017-08-02 17:55:05 +02:00
ansuz 35867001cb add missing messages 2017-08-02 17:38:34 +02:00
Pierre Bondoerffer 304a29e210
Improve contact page 2017-08-02 16:34:35 +02:00
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad 2017-08-02 15:53:04 +02:00
Pierre Bondoerffer b3f3f1dabb
Add What is CryptPad keys 2017-08-02 14:57:27 +02:00
Pierre Bondoerffer db111257f0
Add translations, remove useless functions 2017-08-02 11:46:55 +02:00
Pierre Bondoerffer ba95931802
Use translation keys 2017-07-31 17:53:31 +02:00
ansuz a5b19b1cdd add missing translations 2017-07-26 13:27:34 +02:00
ansuz 8cfd8d3270 add translations for todo 2017-07-26 13:02:14 +02:00
Nicolas Lemoine 658b00814b TodoApp - Style and translations 2017-07-23 16:08:49 +03:00
yflory 9633025afe CSS for the removeHistory button in contacts 2017-07-20 17:26:33 +02:00
ansuz b22127f10c add history removal 2017-07-20 15:55:04 +02:00
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page 2017-07-20 10:09:32 +02:00
yflory 82c87144cb Remove the friend request button when the request is sent 2017-07-19 14:14:34 +02:00
yflory 1dc98dcff1 CSS for the contacts input field 2017-07-19 10:30:38 +02:00
yflory baf439648e Add the contacts app in the dropdown menu 2017-07-18 10:22:51 +02:00
yflory 743b87b70f Add initial text in /contacts 2017-07-17 18:51:23 +02:00
yflory aa8181ab2b Contacts app translations 2017-07-17 18:34:46 +02:00
ansuz 0cd94e2ba8 add title to contacts app 2017-07-17 17:38:41 +02:00
ansuz 06c971ec47 s/friend/contact/g 2017-07-17 15:52:13 +02:00
ansuz 2e0aa185cd uppercase first letter of new translation keys 2017-07-17 14:12:05 +02:00
ansuz 7be1e249e1 add fa-share-alt to pad initialText 2017-07-13 15:48:03 +02:00
ansuz bf9c2b0b84 new messages 2017-07-13 12:29:49 +02:00
Caleb James DeLisle f6abdc2b86 manual merge of staging 2017-07-13 10:30:42 +02:00
yflory b3e225cb3b Replace spinner by text and fix mobile UI 2017-07-12 14:33:28 +02:00
yflory 16d0527e92 Add a page title in drive, settings and file 2017-07-11 15:13:39 +02:00
yflory 125018c8c3 New settings page 2017-07-10 18:29:23 +02:00
yflory 159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 2017-07-10 10:34:25 +02:00
ansuz c60a71e210 add connect button and view profile button 2017-07-10 09:23:58 +02:00
Caleb James DeLisle fcff5fa009 wip 2017-07-02 16:51:21 +02:00
yflory 472a62730b Fix profile creation and add a link to the profile app 2017-06-30 17:24:22 +02:00
yflory b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
yflory b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
yflory 56a25e1036 Small fixes for the new toolbar 2017-06-29 15:15:40 +02:00
ansuz 9b6790534f remove grey text from ckeditor initialState 2017-06-27 14:26:09 +02:00
yflory 36ef4178dc Remove the editable title from the file app 2017-06-26 15:16:17 +02:00
yflory dcfc59c2e2 Translation key updated 2017-06-22 11:21:37 +02:00
yflory 59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory 5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory f13d23241c Upgrade CkEditor to version 4.7 2017-06-20 10:03:13 +02:00
ansuz b80d7513aa skip over the terms of service link 2017-06-19 18:03:39 +02:00
ansuz e2ff88e4c4 tooltips for file upload 2017-06-19 17:56:19 +02:00
yflory 66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
yflory a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
yflory a98353af6c Add a button to upload a file in the drive 2017-06-14 15:55:03 +02:00
ansuz ea79294494 Merge pull request #134 from pbondoer/newpoll
More poll improvements
2017-06-13 14:32:46 +02:00
ansuz 88c2c0afde Merge pull request #135 from blumeva/staging
Staging
2017-06-13 14:23:41 +02:00
XWiki SAS 49370764c1 change whiteboard translation 2017-06-12 18:14:33 +02:00
yflory 376b60c21c New toolbar temp 2017-06-12 15:59:24 +02:00
Pierre Bondoerffer 685b352db8
poll: Add show help button 2017-06-12 14:25:10 +02:00
yflory 8471dab6b1 Provide hints in theme and language dropdowns 2017-06-12 12:47:25 +02:00
yflory df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2017-06-09 14:36:38 +02:00
yflory 6a96aa6819 Disconnect the network when migrating the drive in another tab 2017-06-09 14:36:35 +02:00
yflory ee57458158 Remove the pin limit alert 2017-06-06 10:49:32 +02:00
yflory 85f1fb86d0 Add missing french translation keys 2017-06-06 10:28:00 +02:00
ansuz 909bc2ebf3 add new translation key 2017-05-30 15:39:13 +02:00
ansuz a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-30 10:46:17 +02:00
ansuz 75874424cf add 'support cryptpad' translation key 2017-05-30 10:41:46 +02:00
ansuz 92a7970eb8 fix merge conflicts 2017-05-29 19:04:47 +02:00
ansuz 3915b30055 provide a register button on login
also direct users from file to login
2017-05-29 13:11:07 +02:00
Pierre Bondoerffer b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll 2017-05-29 12:59:49 +02:00
Caleb James DeLisle 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 2017-05-26 18:09:31 +02:00
Pierre Bondoerffer 1092285a68
merge master 2017-05-26 16:18:51 +02:00
ansuz 0a646a9534 remove unnecessary space 2017-05-23 12:35:49 +02:00
yflory d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
yflory c45f08f147 Use a download button instead of downloading a file automatically 2017-05-22 11:43:45 +02:00
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 10:41:55 +02:00
yflory 538aec6ef5 Display a message when pinPads returns an error 2017-05-22 10:41:47 +02:00
ansuz af4fd3c6d3 resolve merge conflicts 2017-05-19 19:14:08 +02:00
yflory 1ab6eb3c5d Add a queue for multiple uploads in the file app 2017-05-19 18:41:34 +02:00
ansuz ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 09:13:38 +02:00
ansuz e7a458295b new translation keys for file upload 2017-05-19 09:10:36 +02:00
yflory 814c81fb13 Display an alert when CryptPad has a new version 2017-05-18 18:51:08 +02:00
yflory 21f9e31e75 Add a placeholder for the user app 2017-05-18 15:56:35 +02:00
yflory 620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +02:00
yflory d13dde856a Add the markdown renderer file and change code's default content 2017-05-18 14:26:56 +02:00
ansuz 827233dcba new translation keys for file upload 2017-05-16 14:01:06 +02:00
yflory 03274c3776 Display an info message in the anonymous drive 2017-05-15 13:54:03 +02:00
yflory 601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
yflory 5d0535966c Center vertically slides in present mode and checkbox to disable transitions 2017-05-11 10:58:33 +02:00
ansuz 6909f663b6 modify 'log out everywhere' text 2017-05-05 15:18:32 +02:00
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 2017-05-05 15:09:07 +02:00
yflory ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
yflory 16f6ab813c Make it clear that the number is the history represents a version 2017-04-28 13:06:55 +02:00
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
yflory f50aa5c29b Move the mediatag viewer into a media app 2017-04-26 14:55:06 +02:00
yflory 9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +02:00
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory 92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
ansuz df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
Pierre Bondoerffer 7a05462eb3
Some more poll changes <3 2017-04-14 19:34:58 +02:00
ansuz eed5b1260d set font-size label to match other ckeditor font sizes 2017-04-14 18:20:40 +02:00
ansuz 84dd879abb add messages for settings page 2017-04-14 17:22:00 +02:00
yflory d5e69653c0 Select opacity in draw mode in the canvas app 2017-04-10 17:03:50 +02:00
yflory cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory 63a130c678 Add a button to delete the selection in canvas 2017-04-10 11:55:39 +02:00
yflory 84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
yflory dedf2b3c69 Display selected color and button to turn off draw mode in canvas 2017-04-07 14:54:02 +02:00
yflory 46a5eee597 Display the spinner in the toolbar for local changes 2017-04-05 14:57:07 +02:00
ansuz 7908f3b4f0 make sure green UI elements use the same green 2017-03-30 15:50:06 +02:00
ansuz a3a0592e5e add English and French keys for the whiteboard app 2017-03-29 11:54:46 +02:00
ansuz b50b76bf81 remove unnecessary lines 2017-03-27 18:13:21 +02:00
yflory d92a875ce5 Translate the 'wrong application' error message 2017-03-27 11:34:54 +02:00
yflory 53c60a31f6 Set the properties and backup inputs to read-only in the drive 2017-03-27 11:14:37 +02:00
ansuz 3e9eb03e5a display a user's public signing key in settings if it exists 2017-03-24 14:26:36 +01:00
ansuz d1c32ea1f8 define english, french, and spanish labels for whiteboard app 2017-03-23 16:50:37 +01:00
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-20 18:05:39 +01:00
ansuz ef0e1d7aa0 add a non-breaking space to pad initialState 2017-03-20 18:05:07 +01:00
yflory 26edb77cf0 Fix style and usability issues in slides 2017-03-20 15:20:42 +01:00
yflory 45ac3e40a2 Copy print options to present mode 2017-03-17 18:03:00 +01:00
yflory 7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
yflory 0607c3bbf3 Add a title to the 'new' button in drive 2017-03-15 17:20:08 +01:00
ansuz dcc4e0dc6b remove extraneous translation 2017-03-14 14:35:27 +01:00
ansuz fcbe3a5224 add already registered message to english translation 2017-03-14 12:40:19 +01:00
ansuz bbe2279b9c add new translations for registration 2017-03-14 11:02:14 +01:00
ansuz a16e6850d4 add translation keys for the feedback page 2017-03-13 12:54:59 +01:00
yflory c00010177d Add tips in the loading screen 2017-03-13 12:41:15 +01:00
ansuz 95a51e8fe4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 12:16:06 +01:00
ansuz ff3641134f update pad initialState 2017-03-13 12:16:01 +01:00
yflory 4a762fec99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 11:53:24 +01:00
yflory ca9faa0056 Fix wrong translation keys 2017-03-13 11:52:48 +01:00
ansuz 1178660815 update code initialState string 2017-03-13 11:52:33 +01:00
yflory f94db93897 Improve the slides layout in print mode 2017-03-10 16:46:36 +01:00