Caleb James DeLisle
|
c274a27dfb
|
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
|
2017-08-04 11:33:28 +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 |
|
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 |