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
|
306fec2d0e
|
improve messages for template picker confirm
|
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
|
8f2776657b
|
Add translations for pad embed
|
7 years ago |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
baf439648e
|
Add the contacts app in the dropdown menu
|
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
|
125018c8c3
|
New settings page
|
7 years ago |
|
yflory
|
159d72f33b
|
Merge branch 'msg' 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 |
|
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 |
|
yflory
|
dcfc59c2e2
|
Translation key updated
|
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
|
b80d7513aa
|
skip over the terms of service link
|
8 years ago |
|
ansuz
|
e2ff88e4c4
|
tooltips for file upload
|
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
|
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 |
|
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
|
ee57458158
|
Remove the pin limit alert
|
8 years ago |
|
yflory
|
85f1fb86d0
|
Add missing french translation keys
|
8 years ago |
|
ansuz
|
909bc2ebf3
|
add new translation key
|
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 |
|
ansuz
|
92a7970eb8
|
fix merge conflicts
|
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 |
|
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 |
|
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
|
827233dcba
|
new translation keys for file upload
|
8 years ago |
|
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
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 |
|
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 |
|
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
|
eed5b1260d
|
set font-size label to match other ckeditor font sizes
|
8 years ago |
|
ansuz
|
84dd879abb
|
add messages for settings page
|
8 years ago |
|
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
8 years ago |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
8 years ago |
|
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
8 years ago |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
8 years ago |
|
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
8 years ago |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
8 years ago |
|
ansuz
|
7908f3b4f0
|
make sure green UI elements use the same green
|
8 years ago |
|
ansuz
|
a3a0592e5e
|
add English and French keys for the whiteboard app
|
8 years ago |
|
ansuz
|
b50b76bf81
|
remove unnecessary lines
|
8 years ago |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
8 years ago |
|
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
8 years ago |
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
8 years ago |
|
ansuz
|
d1c32ea1f8
|
define english, french, and spanish labels for whiteboard app
|
8 years ago |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
ef0e1d7aa0
|
add a non-breaking space to pad initialState
|
8 years ago |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
8 years ago |
|
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
8 years ago |
|
yflory
|
7761aaa89f
|
Add search UI
|
8 years ago |
|
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
8 years ago |
|
ansuz
|
dcc4e0dc6b
|
remove extraneous translation
|
8 years ago |
|
ansuz
|
fcbe3a5224
|
add already registered message to english translation
|
8 years ago |
|
ansuz
|
bbe2279b9c
|
add new translations for registration
|
8 years ago |
|
ansuz
|
a16e6850d4
|
add translation keys for the feedback page
|
8 years ago |
|
yflory
|
c00010177d
|
Add tips in the loading screen
|
8 years ago |
|
ansuz
|
95a51e8fe4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
ff3641134f
|
update pad initialState
|
8 years ago |
|
yflory
|
4a762fec99
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
8 years ago |
|
ansuz
|
1178660815
|
update code initialState string
|
8 years ago |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
8 years ago |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
8 years ago |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
8 years ago |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
8 years ago |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
8 years ago |
|
ansuz
|
c884782d57
|
here are some changes
|
8 years ago |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
8 years ago |
|
ansuz
|
c9040997d5
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
8 years ago |
|
ansuz
|
9800f036c5
|
fix a typo
|
8 years ago |
|
ansuz
|
84a4a15c46
|
fix inverted checkbox description
|
8 years ago |
|
ansuz
|
8c87255267
|
remove any mention of piwik
|
8 years ago |
|
ansuz
|
569d25f25f
|
update some translation keys in English
|
8 years ago |
|
ansuz
|
b87c9d4ba6
|
fix merge conflicts with usability branch
|
8 years ago |
|
ansuz
|
5a49e276b5
|
add settings_anonymous key
|
8 years ago |
|
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
8 years ago |
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
8 years ago |
|
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
8 years ago |
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
8 years ago |
|
yflory
|
95853debf9
|
Update the default pad #1
|
8 years ago |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
8 years ago |
|
ansuz
|
9ccb473b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
|
8 years ago |
|
ansuz
|
252fc7a640
|
uppercase messages
|
8 years ago |
|
ansuz
|
20689b1dec
|
update english translation for usability feedback
|
8 years ago |
|
yflory
|
2d30393243
|
Add support for updated translation key
|
8 years ago |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
8 years ago |
|
yflory
|
e73b4a1131
|
Don't display 'All files' in the menu
|
8 years ago |