Caleb James DeLisle
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
c702a23c77
Initial work on the 'pad will expire' logic
7 years ago
ansuz
087eee55f6
update 404 page
7 years ago
ansuz
f95669a27a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ansuz
fc4fea9c54
update 404 messages and show actual text faster
7 years ago
yflory
f52d987515
Ability to resize avatars before uploading them
7 years ago
ansuz
bcdc0d810a
make 404 page translateable, point to home page or drive
7 years ago
yflory
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
7 years ago
yflory
9795ac32cb
Ability to burn an anonymous drive from the browser
7 years ago
yflory
ce3600b026
Update translation keys
7 years ago
yflory
af8aa25228
Add an option to never rename a file during the session
7 years ago
yflory
25d3d321da
Ability to rename a file before uploading it to the server
7 years ago
yflory
9184dd0ce6
Merge branch 'refactor2' into staging
7 years ago
yflory
af1ea4fd96
Fix typo in the French translation
7 years ago
yflory
dc207393fd
Separate UI elements from cryptpad-common
7 years ago
yflory
2ff66e1a7c
Update french translation
7 years ago
ansuz
2c9df23849
update english text for removing from trash in the drive
7 years ago
ansuz
d10f752457
s/delete/move to trash
7 years ago
yflory
2a3a5c4342
Ability to disable thumbnails
7 years ago
yflory
1871749b6f
Fix -1 viewer in the userlist when disconnected
7 years ago
yflory
cf3024ef5b
Ability to display an error in the toolbar state
7 years ago
yflory
204f3e1441
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
74985fd0f2
Use text for the addUser button in polls
7 years ago
ansuz
7d1892546b
add missing french translation
7 years ago
ansuz
2e5fdf709a
Merge branch 'soon' into staging
7 years ago
yflory
3e4faf1be1
Add new state messages in the toolbar
7 years ago
Yannick A
63dcfd6d18
Update French translation
7 years ago
Caleb James DeLisle
a149152f11
Merge branch 'staging' into framework
7 years ago
yflory
6920129126
Embed images from the drive in whiteboard
7 years ago
Caleb James DeLisle
15337603bb
Merge branch 'staging' into framework
7 years ago
Caleb James DeLisle
753e2d797e
Merge branch 'staging' into framework
7 years ago
yflory
62bc72847f
Add an error message when trying to tag a deleted pad
7 years ago
yflory
50090a3af6
Add placeholders for the comment form in poll
7 years ago
yflory
c985aa60aa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
f4189f883e
Add missing french translation keys
7 years ago
ansuz
d046b9ce33
add missing French key
7 years ago
ansuz
f0bdc3b26f
second try
7 years ago
ansuz
d50a692986
add note about tags to prompt
7 years ago
yflory
d3d6940b69
Update french translation for tags
7 years ago
ansuz
3f181fa370
update loading screen tip for tags
7 years ago
yflory
dd141b5c9f
Disable comments when a poll is not published
7 years ago
Caleb James DeLisle
f0eb58ee95
Merge branch 'staging' into framework
7 years ago
yflory
ab3648a30a
Merge branch 'newpoll' into staging
7 years ago
yflory
1c4f1c785d
Improve stability and UI in poll and its comments
7 years ago
ansuz
080511efcd
add missing translation for hashtags
7 years ago
Caleb James DeLisle
d9e97b86e6
Merge branch 'staging' into framework
7 years ago
yflory
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
7 years ago
ansuz
e2f53eaddb
add loading screen tip about hashtags
7 years ago
ansuz
b8ce149db6
add hint about tag usage
7 years ago
yflory
5cf86bf74a
Update UI in poll and remove old code
7 years ago
Caleb James DeLisle
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
7 years ago
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/
7 years ago
yflory
95542bcdaf
Lint
7 years ago
yflory
8a09e39f46
Enable tags in pads
7 years ago
yflory
c00d295466
Add missing translations
7 years ago
ansuz
e0ae0fcd91
thanks Dima!
7 years ago
yflory
8c3e2dbe61
Missing french translation keys
7 years ago
ansuz
306fec2d0e
improve messages for template picker confirm
7 years ago
yflory
37dca9c155
Add missing translation keys in french
7 years ago
yflory
fc069dac48
Ask the user before loading the template picker
7 years ago
ansuz
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
yflory
fe8b2c2556
Fix french translation
7 years ago
yflory
8f2776657b
Add translations for pad embed
7 years ago
yflory
3ca9f41290
Get embed code for pad and code
7 years ago
yflory
01881ac469
Update loading tips in the french translation
7 years ago
yflory
729c013af7
Get mediatag embed code from the file app
7 years ago
ansuz
6bb29e52e2
lint compliance
7 years ago
CatalinScr
0ceb4cbbcb
Updated the contact page with the new design
7 years ago
CatalinScr
83be769bb3
Merge branch 'master' into staging
...
updated with new version
7 years ago
CatalinScr
f95f3f4f24
Updated the contact page
7 years ago
ansuz
2ef4ebc6ef
two new tips for the loading screen
7 years ago
yflory
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
ansuz
f9cdbe66a0
add forgotten translation string
7 years ago
ansuz
48fe3ef841
add a tip about cryptdrive
7 years ago
ansuz
839c6df3bb
remove invalid loading screen tips. create a new one
7 years ago
yflory
df0b7155f6
Add missing french translation
7 years ago
yflory
a39f802b4d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
e4d842ed08
Fix typos in the french translation
7 years ago
ansuz
7537caf8fe
make footer translateable
7 years ago
ansuz
8ee5e14a60
merge ui-integration
7 years ago
CatalinScr
fd3fd945c8
Updated the Log in Page
7 years ago
CatalinScr
dd48cf7c90
updated the register page
7 years ago
Caleb James DeLisle
7c8df61f91
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
7 years ago
Pierre Bondoerffer
8c0fe7d277
Add missing UI element translations
7 years ago
Caleb James DeLisle
9833bd7e59
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
Caleb James DeLisle
89a8e8050c
Fix typo and also change message to explain itself better
7 years ago
ansuz
328107be4d
translation key for using tabs
7 years ago
ansuz
958294f109
put code settings in their own tab
7 years ago
ansuz
ae0b2ca1a8
add label for code indentation
7 years ago
ansuz
7f2b7fc287
show Your CryptDrive, if logged in. fix typos
7 years ago
Pierre Bondoerffer
baf64114a6
point to homepage in drive
7 years ago
Pierre Bondoerffer
ca686f9c92
(hopefully) fix newline in lists when pasting links
7 years ago
Pierre Bondoerffer
6ca6755d02
more missing titles in toolbar
7 years ago
Pierre Bondoerffer
2cc6c636db
Add some missing titles
7 years ago
Pierre Bondoerffer
355b7f1839
change recent to local pads
7 years ago
Caleb James DeLisle
c274a27dfb
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
7 years ago
Caleb James DeLisle
0d1f19f5d4
Big manual merge
7 years ago
Caleb James DeLisle
52e9ba92fa
Update whitepaper link and also change whatis_zeroknowledge
7 years ago
Pierre Bondoerffer
cdf6345fc1
use sign up
7 years ago
ansuz
35867001cb
add missing messages
7 years ago
Pierre Bondoerffer
304a29e210
Improve contact page
7 years ago
Pierre Bondoerffer
d6679e8ef3
Add screenshots to What is CryptPad
7 years ago
Pierre Bondoerffer
b3f3f1dabb
Add What is CryptPad keys
7 years ago
Pierre Bondoerffer
db111257f0
Add translations, remove useless functions
7 years ago
Pierre Bondoerffer
ba95931802
Use translation keys
7 years ago
Pierre Bondoerffer
f2a78ddfd9
New FR/ES keys
7 years ago
ansuz
1ca00e7e01
resolve merge conflicts
7 years ago
ansuz
411c64df85
Merge branch 'master' into master
7 years ago
ansuz
a5b19b1cdd
add missing translations
7 years ago
ansuz
8cfd8d3270
add translations for todo
7 years ago
Nicolas Lemoine
658b00814b
TodoApp - Style and translations
7 years ago
c4rl0sc
2e8e44933a
Fixed spelling error in Spanish translation
7 years ago
c4rl0sc
064e189495
Fixed spelling issues and improved translation quality.
7 years ago
ansuz
76e69f0ba8
Merge pull request #127 from gustavohmsilva/master
...
Merged translated and non-translated in pt-BR
7 years ago
Gustavo H M Silva
6785f166fd
Merge branch 'master' into master
7 years ago
MacLemon
25cba8bba3
Translated missing out.presentSuccess to german
7 years ago
yflory
9633025afe
CSS for the removeHistory button in contacts
7 years ago
ansuz
b22127f10c
add history removal
7 years ago
Caleb James DeLisle
ffb5e555a0
Merge branch 'staging' into front-page
7 years ago
yflory
82c87144cb
Remove the friend request button when the request is sent
7 years ago
yflory
1dc98dcff1
CSS for the contacts input field
7 years ago
yflory
26fa914982
Missing translation keys
7 years ago
Pierre Bondoerffer
a2c2e98060
Spanish update
7 years ago
yflory
6aab1c94b2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
yflory
baf439648e
Add the contacts app in the dropdown menu
7 years ago
ansuz
5716f76c91
fix typo in translations
7 years ago
yflory
743b87b70f
Add initial text in /contacts
7 years ago
yflory
aa8181ab2b
Contacts app translations
7 years ago
ansuz
0cd94e2ba8
add title to contacts app
7 years ago
ansuz
06c971ec47
s/friend/contact/g
7 years ago
ansuz
2e0aa185cd
uppercase first letter of new translation keys
7 years ago
ansuz
7be1e249e1
add fa-share-alt to pad initialText
7 years ago
ansuz
bf9c2b0b84
new messages
7 years ago
Caleb James DeLisle
f6abdc2b86
manual merge of staging
7 years ago
yflory
b3e225cb3b
Replace spinner by text and fix mobile UI
7 years ago
yflory
16d0527e92
Add a page title in drive, settings and file
7 years ago
yflory
59213a9c4e
Typo
7 years ago
yflory
125018c8c3
New settings page
7 years ago
yflory
159d72f33b
Merge branch 'msg' into staging
7 years ago
ansuz
086e5909dd
Merge branch 'soon' into staging
7 years ago
ansuz
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
7 years ago
ansuz
c60a71e210
add connect button and view profile button
7 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
Pierre Bondoerffer
7a05462eb3
Some more poll changes <3
8 years ago
ansuz
50793f506d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ansuz
eed5b1260d
set font-size label to match other ckeditor font sizes
8 years ago
Pierre Bondoerffer
0db603f580
spanish pinpad
8 years ago