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 |
|
yflory
|
2e378564d0
|
Make the 'pad' initial state translatable
|
8 years ago |
|
yflory
|
81fbe0fdd1
|
Add back some translation keys that shouldn't have been removed
|
8 years ago |
|
ansuz
|
ed19c6885d
|
join array in messages.js
|
8 years ago |
|
yflory
|
454d1c2052
|
Do not load all the translations anymore, only the needed one
|
8 years ago |
|
yflory
|
434c3a220c
|
Remove old translation keys #2
|
8 years ago |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
8 years ago |
|
yflory
|
a6497f7a52
|
Add a way to show the drive tips again
|
8 years ago |
|
yflory
|
550c65aae0
|
Add a default pad in CryptDrive after signing up
|
8 years ago |
|
yflory
|
7497e0d1c5
|
Add a dropdown user menu to the top bar in static pages
|
8 years ago |
|
ansuz
|
5ae65c8bc1
|
make the user confirm
|
8 years ago |
|
ansuz
|
7d0c29513c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
7d21206cae
|
add registration introductory text
|
8 years ago |
|
yflory
|
2807ad9dc3
|
Add spinner and translate the register page
|
8 years ago |
|
yflory
|
3aa03225c9
|
Add a spinner when hashing the password and translate homepage
|
8 years ago |
|
ansuz
|
3b1bd2f720
|
use additional translation keys for registration
|
8 years ago |
|
yflory
|
6026351091
|
Improve the homepage (style and translations)
|
8 years ago |
|
yflory
|
d54262c8df
|
Use the same disconnecter error translation key for all the apps
|
8 years ago |
|
Caleb James DeLisle
|
2eccc6a69f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
Caleb James DeLisle
|
9dfe3ccaac
|
Change 'jot it down' to 'write it down' in the front page
|
8 years ago |
|
yflory
|
914c442615
|
Do not redirect to home page when logging out from another tab
|
8 years ago |
|
yflory
|
7e7d1f7a16
|
Display the error when opening a document with the wrong app
|
8 years ago |
|
yflory
|
ad82a275bc
|
Replace the Apps button by a New button again
|
8 years ago |
|
yflory
|
fbbf8a2829
|
Replace initialState by a placeholder in slide and code
|
8 years ago |
|
yflory
|
9c4c378d6a
|
Add a footer to the html pages
|
8 years ago |
|
yflory
|
02439e0f61
|
Improve the homepage with new images and translations
|
8 years ago |
|
yflory
|
46b48df966
|
Don't display 'Hello null' if we can't get the account name
|
8 years ago |
|
yflory
|
91299f5f30
|
Ability to access the drive from any pad
|
8 years ago |
|
yflory
|
b0fb56fa63
|
Allow logge din users to access the home page
|
8 years ago |
|
yflory
|
35a49ac195
|
Improve the connection lost message with read-only
|
8 years ago |
|
yflory
|
4bb02b9d4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
89da142204
|
Fix pad creation from the context menu
|
8 years ago |
|
ansuz
|
1a061c22a0
|
more consistent styles and improved SEO
|
8 years ago |
|
yflory
|
46b5b8766d
|
Dropdown button to make a pad from homepage
|
8 years ago |
|
yflory
|
2e247d44c7
|
Hide the backup icon when logged in
|
8 years ago |
|
yflory
|
29578a7400
|
Merge branch 'hpbs' into newtoolbar
|
8 years ago |
|
yflory
|
f42665ba49
|
Remove the unowned pads category
|
8 years ago |
|
yflory
|
9d275daebb
|
Backport changes for the login page from hpbs branch
|
8 years ago |
|
yflory
|
fa8a0d5880
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
b9c4ceccd4
|
Change the CSS and colors
|
8 years ago |
|
yflory
|
88d5b4cc9c
|
Add a 'New pad' button in the toolbar
|
8 years ago |
|
yflory
|
82e8041054
|
Use bootstrap 4 in the main page
|
8 years ago |
|
yflory
|
73d424b506
|
Improve the login UI (css and translations)
|
8 years ago |
|
yflory
|
e006ed7076
|
Ability to log in from the main page
|
8 years ago |
|
yflory
|
6652e9d6d9
|
Test new home page
|
8 years ago |
|
yflory
|
efed1f5efe
|
Add handlers to login and logout buttons
|
8 years ago |
|
yflory
|
569ea21705
|
Replace the language selector by our custom dropdown menu
|
8 years ago |
|
yflory
|
4278ac7637
|
Merge branch 'soon' into fileManager
|
8 years ago |
|
yflory
|
2be5db9540
|
Ability to open files in readonly mode
Fix CSS issues
|
8 years ago |
|
yflory
|
f74d0a46a4
|
Remove the alert when pressing del in 'all files'
|
8 years ago |
|
ansuz
|
b39067d2a1
|
jshint compliance
|
8 years ago |
|
yflory
|
5b08fed7fa
|
Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
|
8 years ago |
|
yflory
|
d5561910d4
|
Move the file manager into /drive and add a toolbar
|
8 years ago |
|
ansuz
|
05a956879a
|
prepare new poll app for release
move old poll into poll/old
|
8 years ago |
|
ansuz
|
fefe444501
|
add new translation keys
|
8 years ago |
|
ansuz
|
6a46d6e06c
|
update page layout and account for about page
|
8 years ago |
|
ansuz
|
db12b5e896
|
move text for login page into translation file
|
8 years ago |
|
ansuz
|
f9da200381
|
resolve merge conflicts in translations
|
8 years ago |
|
ansuz
|
5534da8abf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
8 years ago |
|
ansuz
|
21360801de
|
change a few english keys
|
8 years ago |
|
yflory
|
9b6c9e3891
|
Add support for templates in the file manager
|
8 years ago |
|
Pierre BONDOERFFER
|
87582d41a9
|
Added alt tags to English translation
|
8 years ago |
|
yflory
|
87abfff66b
|
Fix Flash Of Unstyled Content (fouc)
|
8 years ago |
|
yflory
|
046220f239
|
Add info boxes for the different categories
|
8 years ago |
|
yflory
|
e9418af88b
|
Add an info box in the file manager
|
8 years ago |
|
ansuz
|
6778a7062d
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
5a39caf95a
|
new messages for login
|
8 years ago |
|
yflory
|
e3f484d876
|
File manager in the home page, lint
|
8 years ago |
|
ansuz
|
2ee5ef2289
|
add english translations for login
|
8 years ago |
|
yflory
|
fdb5c2ddb5
|
Fix UI issues with rename and delete actions
|
8 years ago |
|
yflory
|
ee56f5608f
|
Fix the infinite spinner bug with the file manager store
|
8 years ago |
|
yflory
|
cb43eb9ca1
|
Merge branch 'newpoll' into fileManagerMerge
|
8 years ago |
|
yflory
|
9b3719e0ae
|
Merge branch 'soon' into fileManagerMerge
|
8 years ago |
|
yflory
|
740b6e955e
|
Improve UI, fix issues with the table
|
8 years ago |
|
yflory
|
90804ed9e0
|
Add usernames/userlist in the toolbar and fix publish button
|
8 years ago |
|
yflory
|
5a5451d94c
|
Sort elements in the trash, add properties in the context menu, fix issue with Edge
|
8 years ago |
|
yflory
|
da19608269
|
Translate the context menus, Shift+Del shortcut and realtime object
|
8 years ago |
|
yflory
|
7a035fa4a0
|
Fix drag and drop with multiple elements selected
|
8 years ago |
|
yflory
|
d77970975c
|
Add translations, ability to select multiple elements, clean the code
|
8 years ago |
|
ansuz
|
933831a2a8
|
add a comment about _languageName
|
8 years ago |
|
ansuz
|
e52450fdc7
|
update english and french translations to include link to bitcoin.pdf
|
8 years ago |
|
ansuz
|
8064b1d196
|
merge changes from soon
|
8 years ago |
|
yflory
|
ab1d3958ce
|
Add a pencil icon when hovering the title
|
8 years ago |
|
yflory
|
6d1e06cca3
|
Add notifications when a user joins or leaves the channel
|
8 years ago |
|
yflory
|
87d86384ac
|
Fix broken elements in the new toolbar
|
8 years ago |
|
yflory
|
6351d1856f
|
Remove the top bar and move its content in the applications' toolbars
|
8 years ago |
|
Yann Flory
|
1e003b13a8
|
ask anonymous, first-time users to set their name when they first join a pad
|
8 years ago |
|
yflory
|
39bbf8a6c1
|
Fix the new userlist button and make the toolbar responsive
|
8 years ago |
|
yflory
|
24fbe22c9d
|
Improve the toolbar style and the way the userlist is displayed
|
8 years ago |
|
yflory
|
d2389a5729
|
Change the userlist in the toolbar
|
8 years ago |
|
yflory
|
d63c912af0
|
Use the HTML5 color picker to change the colors in slides
|
8 years ago |
|
yflory
|
a30e17121d
|
Merge branch 'readonlyButton' into soon
|
8 years ago |
|
yflory
|
e84a54556c
|
Move the toolbar buttons' events handlers in cryptpad-common
|
8 years ago |
|
ansuz
|
ee88e96baf
|
merge noscript
|
8 years ago |
|
yflory
|
391728ee6d
|
Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
|
8 years ago |
|
Yann Flory
|
2609af2105
|
Use the CodeMirror editor in the slide application
|
8 years ago |
|
yflory
|
bc73fa2074
|
Merge branch 'fontawesome' into soon
|
8 years ago |
|
ansuz
|
921ee128bc
|
deobfuscate email
|
8 years ago |
|
yflory
|
ebae2c3bec
|
Fix the noscript tag
|
8 years ago |
|
yflory
|
f03018f3bc
|
Improve the top bar and use the font awesome icons in /code
|
8 years ago |
|
yflory
|
3d54413343
|
Improve the UI with FontAwesome icons
|
8 years ago |
|
yflory
|
dde519795d
|
Merge branch 'newhash' into newhashNoConflict
|
8 years ago |
|
ansuz
|
f6372ee803
|
add noreferrer attr to blank links as well
|
8 years ago |
|
ansuz
|
c50a0ac579
|
where target=blank, rel=noopener
|
8 years ago |
|
yflory
|
83705ae058
|
Improve the UI in read-only mode
|
8 years ago |
|
ansuz
|
259896a373
|
fix translation fragment in English messages file
|
8 years ago |
|
Yann Flory
|
bf8c9a2c4b
|
Add a button to get the read only URL
|
8 years ago |
|
Yann Flory
|
99b50465c7
|
Add the read-only mode for /pad and /code
|
8 years ago |
|
yflory
|
5c63585952
|
Complete the French translation
|
8 years ago |
|
yflory
|
0d9f63b977
|
Merge branch 'translations' - part one
|
8 years ago |
|
yflory
|
f086492e50
|
Improve the localization system
Improve and enable the French translation
|
8 years ago |