Commit Graph

447 Commits (95302366d13fcc2aa0df142ec7dd10f080cafe57)

Author SHA1 Message Date
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
Pierre Bondoerffer f2a78ddfd9
New FR/ES keys 2017-07-31 16:55:09 +02:00
ansuz 1ca00e7e01 resolve merge conflicts 2017-07-31 16:00:45 +02:00
ansuz 411c64df85 Merge branch 'master' into master 2017-07-31 15:49:54 +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
c4rl0sc 2e8e44933a Fixed spelling error in Spanish translation 2017-07-23 14:31:12 +02:00
c4rl0sc 064e189495 Fixed spelling issues and improved translation quality. 2017-07-23 14:16:34 +02:00
ansuz 76e69f0ba8 Merge pull request #127 from gustavohmsilva/master
Merged translated and non-translated in pt-BR
2017-07-22 16:07:44 +02:00
Gustavo H M Silva 6785f166fd Merge branch 'master' into master 2017-07-22 09:18:12 -03:00
MacLemon 25cba8bba3 Translated missing out.presentSuccess to german 2017-07-20 20:08:30 +02: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 26fa914982 Missing translation keys 2017-07-18 11:07:34 +02:00
Pierre Bondoerffer a2c2e98060
Spanish update 2017-07-18 10:30:28 +02:00
yflory 6aab1c94b2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-18 10:24:00 +02:00
yflory baf439648e Add the contacts app in the dropdown menu 2017-07-18 10:22:51 +02:00
ansuz 5716f76c91 fix typo in translations 2017-07-18 10:04:02 +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 59213a9c4e Typo 2017-07-11 11:18:13 +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 086e5909dd Merge branch 'soon' into staging 2017-07-10 10:43:41 +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
Pierre Bondoerffer 56ed1dd457
spanish update 2017-07-06 10:13:56 +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
Gustavo H M Silva 6af4335ead Translated up to page 317
Translated up to page 317
2017-06-23 14:28:00 -03:00
yflory 06a0590f73 New folder icons 2017-06-23 17:58:41 +02:00
yflory dcfc59c2e2 Translation key updated 2017-06-22 11:21:37 +02:00
Gogs 6dacbf2bd9 add translations and some improvements 2017-06-21 21:38:56 +02:00
yflory 8d956c3de6 New toolbar 2017-06-21 18:04:35 +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 9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 18:09:57 +02:00
ansuz b80d7513aa skip over the terms of service link 2017-06-19 18:03:39 +02:00
yflory 1275f3f3a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 17:59:18 +02:00
yflory f5da7ae42e Add a new loading tip in french 2017-06-19 17:59:12 +02:00
ansuz e2ff88e4c4 tooltips for file upload 2017-06-19 17:56:19 +02:00
Pierre Bondoerffer 726302a9ee
Spanish update 2017-06-19 15:05:17 +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 0004be521c change translation 2017-06-13 14:21:22 +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
Pierre Bondoerffer 621376b0fa
small fixes 2017-06-09 17:44:13 +02:00
Pierre Bondoerffer cce665a18b
spanish updates 2017-06-09 17:42: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 ac91d2f413 Fix the upgrade and donate buttons in the home page 2017-06-06 11:37:54 +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 ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz 8d4017b79e fix parse error 2017-06-05 11:35:05 +02:00
jxtsai b9b8352633 Traditional Chinese 2017-06-05 15:10:13 +08:00
ansuz 909bc2ebf3 add new translation key 2017-05-30 15:39:13 +02:00
Gustavo H M Silva 81b931e56f Update messages.pt-br.js 2017-05-30 09:45:14 -03: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
Gustavo H M Silva 08619e733a Partial translation + duplicated token fix
Partial translation + duplicated token fix
2017-05-29 15:19:04 -03:00
Gustavo H M Silva 2d2e00b569 Merged translated and non-translated in pt-BR
I've merged the new tokens on the old translation in order to get a better understanding when updating the Brazilian Portuguese translation. It ran fine locally.
2017-05-29 14:43:15 -03:00
ansuz 92a7970eb8 fix merge conflicts 2017-05-29 19:04:47 +02:00
Pierre Bondoerffer 0a92719763
spanish! new keys ahoy 2017-05-29 18:25:18 +02:00
Pierre Bondoerffer 6518b56945
poll: french messages 2017-05-29 16:50:25 +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
ansuz b910915d47 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-29 11:33:03 +02:00
ansuz 6573813523 Merge branch 'soon' into staging 2017-05-29 11:32:54 +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
Caleb James DeLisle 6c1861dbc6 Merge branch 'soon' into staging 2017-05-26 15:48:44 +02:00
superniko 0559b8cb77 Update messages.ro.js 2017-05-26 16:47:45 +03:00
superniko 70fbbe0078 Update messages.ro.js 2017-05-25 10:23:27 +03:00