Caleb James DeLisle
0d1f19f5d4
Big manual merge
8 years ago
Caleb James DeLisle
52e9ba92fa
Update whitepaper link and also change whatis_zeroknowledge
8 years ago
Pierre Bondoerffer
cdf6345fc1
use sign up
8 years ago
ansuz
35867001cb
add missing messages
8 years ago
Pierre Bondoerffer
304a29e210
Improve contact page
8 years ago
Pierre Bondoerffer
d6679e8ef3
Add screenshots to What is CryptPad
8 years ago
Pierre Bondoerffer
b3f3f1dabb
Add What is CryptPad keys
8 years ago
Pierre Bondoerffer
db111257f0
Add translations, remove useless functions
8 years ago
Pierre Bondoerffer
ba95931802
Use translation keys
8 years ago
Pierre Bondoerffer
f2a78ddfd9
New FR/ES keys
8 years ago
ansuz
1ca00e7e01
resolve merge conflicts
8 years ago
ansuz
411c64df85
Merge branch 'master' into master
8 years ago
ansuz
a5b19b1cdd
add missing translations
8 years ago
ansuz
8cfd8d3270
add translations for todo
8 years ago
Nicolas Lemoine
658b00814b
TodoApp - Style and translations
8 years ago
c4rl0sc
2e8e44933a
Fixed spelling error in Spanish translation
8 years ago
c4rl0sc
064e189495
Fixed spelling issues and improved translation quality.
8 years ago
ansuz
76e69f0ba8
Merge pull request #127 from gustavohmsilva/master
...
Merged translated and non-translated in pt-BR
8 years ago
Gustavo H M Silva
6785f166fd
Merge branch 'master' into master
8 years ago
MacLemon
25cba8bba3
Translated missing out.presentSuccess to german
8 years ago
yflory
9633025afe
CSS for the removeHistory button in contacts
8 years ago
ansuz
b22127f10c
add history removal
8 years ago
Caleb James DeLisle
ffb5e555a0
Merge branch 'staging' into front-page
8 years ago
yflory
82c87144cb
Remove the friend request button when the request is sent
8 years ago
yflory
1dc98dcff1
CSS for the contacts input field
8 years ago
yflory
26fa914982
Missing translation keys
8 years ago
Pierre Bondoerffer
a2c2e98060
Spanish update
8 years ago
yflory
6aab1c94b2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
baf439648e
Add the contacts app in the dropdown menu
8 years ago
ansuz
5716f76c91
fix typo in translations
8 years ago
yflory
743b87b70f
Add initial text in /contacts
8 years ago
yflory
aa8181ab2b
Contacts app translations
8 years ago
ansuz
0cd94e2ba8
add title to contacts app
8 years ago
ansuz
06c971ec47
s/friend/contact/g
8 years ago
ansuz
2e0aa185cd
uppercase first letter of new translation keys
8 years ago
ansuz
7be1e249e1
add fa-share-alt to pad initialText
8 years ago
ansuz
bf9c2b0b84
new messages
8 years ago
Caleb James DeLisle
f6abdc2b86
manual merge of staging
8 years ago
yflory
b3e225cb3b
Replace spinner by text and fix mobile UI
8 years ago
yflory
16d0527e92
Add a page title in drive, settings and file
8 years ago
yflory
59213a9c4e
Typo
8 years ago
yflory
125018c8c3
New settings page
8 years ago
yflory
159d72f33b
Merge branch 'msg' into staging
8 years ago
ansuz
086e5909dd
Merge branch 'soon' into staging
8 years ago
ansuz
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
8 years ago
ansuz
c60a71e210
add connect button and view profile button
8 years ago
Pierre Bondoerffer
56ed1dd457
spanish update
8 years ago
Caleb James DeLisle
fcff5fa009
wip
8 years ago
yflory
472a62730b
Fix profile creation and add a link to the profile app
8 years ago
yflory
b153dda6ff
Add avatars in the user list
8 years ago
yflory
b9320e6005
Toolbar improvements
8 years ago
yflory
56a25e1036
Small fixes for the new toolbar
8 years ago
ansuz
9b6790534f
remove grey text from ckeditor initialState
8 years ago
yflory
36ef4178dc
Remove the editable title from the file app
8 years ago
Gustavo H M Silva
6af4335ead
Translated up to page 317
...
Translated up to page 317
8 years ago
yflory
06a0590f73
New folder icons
8 years ago
yflory
dcfc59c2e2
Translation key updated
8 years ago
Gogs
6dacbf2bd9
add translations and some improvements
8 years ago
yflory
8d956c3de6
New toolbar
8 years ago
yflory
59fb5bd8be
One toolbar color per app
8 years ago
yflory
5a248db267
Merge branch 'staging' into newCk
8 years ago
yflory
f13d23241c
Upgrade CkEditor to version 4.7
8 years ago
ansuz
9be23be5eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
b80d7513aa
skip over the terms of service link
8 years ago
yflory
1275f3f3a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
f5da7ae42e
Add a new loading tip in french
8 years ago
ansuz
e2ff88e4c4
tooltips for file upload
8 years ago
Pierre Bondoerffer
726302a9ee
Spanish update
8 years ago
yflory
66b076111e
Add an upload button to the slide's file picker
8 years ago
yflory
a237eec41e
Add a file picker in the slide app
8 years ago
yflory
a98353af6c
Add a button to upload a file in the drive
8 years ago
ansuz
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
8 years ago
ansuz
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
8 years ago
XWiki SAS
0004be521c
change translation
8 years ago
XWiki SAS
49370764c1
change whiteboard translation
8 years ago
yflory
376b60c21c
New toolbar temp
8 years ago
Pierre Bondoerffer
685b352db8
poll: Add show help button
8 years ago
yflory
8471dab6b1
Provide hints in theme and language dropdowns
8 years ago
Pierre Bondoerffer
621376b0fa
small fixes
8 years ago
Pierre Bondoerffer
cce665a18b
spanish updates
8 years ago
yflory
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
8 years ago
yflory
6a96aa6819
Disconnect the network when migrating the drive in another tab
8 years ago
yflory
ac91d2f413
Fix the upgrade and donate buttons in the home page
8 years ago
yflory
ee57458158
Remove the pin limit alert
8 years ago
yflory
85f1fb86d0
Add missing french translation keys
8 years ago
ansuz
ec9a4dec5e
Merge branch 'soon' into staging
8 years ago
ansuz
8d4017b79e
fix parse error
8 years ago
jxtsai
b9b8352633
Traditional Chinese
8 years ago
ansuz
909bc2ebf3
add new translation key
8 years ago
Gustavo H M Silva
81b931e56f
Update messages.pt-br.js
8 years ago
ansuz
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
75874424cf
add 'support cryptpad' translation key
8 years ago
Gustavo H M Silva
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
8 years ago
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.
8 years ago
ansuz
92a7970eb8
fix merge conflicts
8 years ago
Pierre Bondoerffer
0a92719763
spanish! new keys ahoy
8 years ago
Pierre Bondoerffer
6518b56945
poll: french messages
8 years ago
ansuz
3915b30055
provide a register button on login
...
also direct users from file to login
8 years ago
Pierre Bondoerffer
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
8 years ago
ansuz
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
6573813523
Merge branch 'soon' into staging
8 years ago
Caleb James DeLisle
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
8 years ago
Pierre Bondoerffer
1092285a68
merge master
8 years ago
Caleb James DeLisle
6c1861dbc6
Merge branch 'soon' into staging
8 years ago
superniko
0559b8cb77
Update messages.ro.js
8 years ago
superniko
70fbbe0078
Update messages.ro.js
8 years ago
ansuz
bc26f7fc4e
Merge branch 'soon' into staging
8 years ago
Caleb James DeLisle
70c1061f47
Fix romanian translation
8 years ago
Caleb James DeLisle
83c0a6d37d
Romanian translation
8 years ago
yflory
b281d51d90
Fix typos in the french translation
8 years ago
yflory
38bd6b3808
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
964d046154
Update a french translation key
8 years ago
ansuz
0a646a9534
remove unnecessary space
8 years ago
yflory
d55b7e411c
Display an alert in the drive when the limit is reached
8 years ago
yflory
c45f08f147
Use a download button instead of downloading a file automatically
8 years ago
yflory
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
yflory
538aec6ef5
Display a message when pinPads returns an error
8 years ago
ansuz
af4fd3c6d3
resolve merge conflicts
8 years ago
yflory
1ab6eb3c5d
Add a queue for multiple uploads in the file app
8 years ago
ansuz
ba5ef5157e
show pretty representations of storage usage
8 years ago
ansuz
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
e7a458295b
new translation keys for file upload
8 years ago
yflory
814c81fb13
Display an alert when CryptPad has a new version
8 years ago
yflory
21f9e31e75
Add a placeholder for the user app
8 years ago
yflory
620f4dc512
Add translations for the markdown preview button title
8 years ago
yflory
d13dde856a
Add the markdown renderer file and change code's default content
8 years ago
ansuz
517438d7c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
81af9225fc
template a Romanian translation
8 years ago
ansuz
e8275c02c6
Merge pull request #115 from pbondoer/spanish
...
Spanish update
8 years ago
Pierre Bondoerffer
ad6217f064
file upload spanish keys
8 years ago
ansuz
827233dcba
new translation keys for file upload
8 years ago
yflory
03274c3776
Display an info message in the anonymous drive
8 years ago
Pierre Bondoerffer
ad5e18f558
Spanish update
8 years ago
yflory
601226115b
New anonymous drive
8 years ago
yflory
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
8 years ago
yflory
ca6f910f0b
Add french translations for 'log out everywhere'
8 years ago
ansuz
6909f663b6
modify 'log out everywhere' text
8 years ago
ansuz
a173e4c7a0
add 'log out everywhere' functionality in settings
8 years ago
yflory
ef89451a83
Display the storage limit in the drive
8 years ago
yflory
16f6ab813c
Make it clear that the number is the history represents a version
8 years ago
yflory
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
yflory
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
yflory
f50aa5c29b
Move the mediatag viewer into a media app
8 years ago
yflory
9882a3a923
Add support for the file applicaiton in the drive
8 years ago
Pierre Bondoerffer
ba407322e8
Update spanish
8 years ago
yflory
3e28d1b966
Add a missing key in the french translation
8 years ago
yflory
9abfadb32f
Update french translation
8 years ago
ansuz
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
yflory
92ea03d7d9
View and restore the history of a pad
8 years ago
ansuz
df9c312b7d
make new text translateable
8 years ago