ffb5e555a0
Merge branch 'staging' into front-page
7 years ago
c33d2a2db0
New tooltips
7 years ago
82c87144cb
Remove the friend request button when the request is sent
7 years ago
1dc98dcff1
CSS for the contacts input field
7 years ago
26fa914982
Missing translation keys
7 years ago
a2c2e98060
Spanish update
7 years ago
6aab1c94b2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
baf439648e
Add the contacts app in the dropdown menu
7 years ago
5716f76c91
fix typo in translations
7 years ago
743b87b70f
Add initial text in /contacts
7 years ago
aa8181ab2b
Contacts app translations
7 years ago
0cd94e2ba8
add title to contacts app
7 years ago
f2320190b8
change friends url to /contacts/
7 years ago
06c971ec47
s/friend/contact/g
7 years ago
2e0aa185cd
uppercase first letter of new translation keys
7 years ago
6306de5265
set avatar border-radius to 4px
7 years ago
33dcd2ae28
drop black border from avatars in userlist
7 years ago
e2c17dbeb4
resolve conflicts
7 years ago
557f13f796
Unfriend and update username - beta
7 years ago
7be1e249e1
add fa-share-alt to pad initialText
7 years ago
96d2ff67e1
user-plus as icon for add-friend
7 years ago
bf9c2b0b84
new messages
7 years ago
f6abdc2b86
manual merge of staging
7 years ago
ac684a8dc7
Use the APP toolbar in profile
7 years ago
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b3e225cb3b
Replace spinner by text and fix mobile UI
7 years ago
3453e54357
bump footer and package.json for upcoming version
7 years ago
42075e4b5f
Make everything 16px and 32px
7 years ago
16d0527e92
Add a page title in drive, settings and file
7 years ago
5d5f936682
Hide the upload table in code
7 years ago
a0b14faf89
Fix the font in settings and drive
7 years ago
112c4c85e5
Left menu in drive
7 years ago
59213a9c4e
Typo
7 years ago
560671ae7d
Make avatars circle
7 years ago
125018c8c3
New settings page
7 years ago
c02fa39524
Make drive search bar blue
7 years ago
0157e04b10
Fix overflowing content in the home page
7 years ago
e6188bfb63
Fix useradmin dropdown position
7 years ago
e8f3df5a46
Clean less
7 years ago
159d72f33b
Merge branch 'msg' into staging
7 years ago
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ff10c282d4
Avatar in the user admin button
7 years ago
52eb8e307c
feedback for language used
7 years ago
086e5909dd
Merge branch 'soon' into staging
7 years ago
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
7 years ago
c60a71e210
add connect button and view profile button
7 years ago
6f7c60bf12
Merge pull request #154 from evalica/153
...
Issue #153 : On Register, add spacing between checkboxes and labels
7 years ago
e8e8858e44
Issue #153 : On Register, add spacing between checkboxes and labels
7 years ago
fc065a0484
Issue #151 : Spacing between "Log-in" and "Register" buttons
...
- Removed ".first" class from Register button
- Increase spacing between buttons
7 years ago
a5e8f6ae81
Add friend app and fix avatar size
7 years ago
f02285d103
fix lowercased p
7 years ago
56ed1dd457
spanish update
7 years ago
4016a95540
prototype invite app
7 years ago
bf17ad3f1e
Friend button in the userlist
7 years ago
d7f9ddd8d2
Fix icon colors in the new menu (/pad app)
8 years ago
cc67838786
Fix horizontal scrollbar in /pad anonymous mode
8 years ago
fa06f9d413
fix minor bugs in poll
8 years ago
43d4597f38
merge to master
8 years ago
25905d13fa
wip
8 years ago
47c6c64b8a
Allow emojis in default avatars
8 years ago
ffd184d50e
Fix overflowing names in the new userlist
8 years ago
1a27f11e73
Fix dropdown menus in static pages
8 years ago
fa2d857d70
Fix css issues with Safari
8 years ago
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1df5e6e855
Fix toolbar buttons for Safari
8 years ago
bf414c15ee
fix logout button on home page
8 years ago
70c9f3df75
Fix avatar size
8 years ago
fcff5fa009
wip
8 years ago
335898a4c7
Hack the drawer to close it when clicking outside
8 years ago
472a62730b
Fix profile creation and add a link to the profile app
8 years ago
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b153dda6ff
Add avatars in the user list
8 years ago
c2e153e8ed
more fouc fixes
8 years ago
8ffad5ece6
FOUC fixes
8 years ago
b6944e6638
Fix userlist style in apps without iframe
8 years ago
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
568ce70afd
Add a spinner for the history and update history buttons
8 years ago
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c25f2df721
Added caching versions to some of the images which are loaded by js
8 years ago
b9320e6005
Toolbar improvements
8 years ago
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
8 years ago
0b9d7d6c0b
fix color of links in poll and whiteboard
8 years ago
56a25e1036
Small fixes for the new toolbar
8 years ago
c53ebe3598
bring upload status container to the front
8 years ago
5e56ad912e
remove the last bit of compiled css
8 years ago
7de2683169
make all apps use clientside templates
8 years ago
bdca6b10c2
use templates in poll.js
8 years ago
3a9b480e4e
resolve merge conflicts in template.js
8 years ago
40f4fc2682
Add the profile app in template.js
8 years ago
9b6790534f
remove grey text from ckeditor initialState
8 years ago
e9bfaa9a60
compile less clientside. remove compiled css
8 years ago
c431041e3f
Fix position of the rightside drawer with small screen
8 years ago
36ef4178dc
Remove the editable title from the file app
8 years ago
c364803406
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
805e604e53
Add missing icons
8 years ago
f181e8db60
correct parentheses
8 years ago
f4fdb7040c
Optimize image assets to speedup page loading
8 years ago
6af4335ead
Translated up to page 317
...
Translated up to page 317
8 years ago
ce44a8d351
Fix the backup button in anonymous drive
8 years ago
06a0590f73
New folder icons
8 years ago
0d4d104e08
Mobile support for the new toolbar
8 years ago
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
684269fdda
Userlist in polls
8 years ago
bd1db735dd
jshint compliance
8 years ago
35bfa1dce4
test client-side templates in whiteboard app
8 years ago
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
13288ee18b
Update the userlist in code, slide and pad
8 years ago
dcfc59c2e2
Translation key updated
8 years ago
92b6e60573
Small improvements for the new toolbar
8 years ago
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
115813c191
Merge branch 'new-templates' into staging
8 years ago
3657e978fd
give main2.js a more sensible name
8 years ago
e86ef209a8
define loading screen markup in js
8 years ago
118b83c420
make register and login user clientside templates
8 years ago
6dacbf2bd9
add translations and some improvements
8 years ago
8d956c3de6
New toolbar
8 years ago
48f9745619
clientside templating
8 years ago
b7a0547b77
New toolbar colors
8 years ago
59fb5bd8be
One toolbar color per app
8 years ago
5a248db267
Merge branch 'staging' into newCk
8 years ago
f13d23241c
Upgrade CkEditor to version 4.7
8 years ago
9be23be5eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b80d7513aa
skip over the terms of service link
8 years ago
1275f3f3a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f5da7ae42e
Add a new loading tip in french
8 years ago
e2ff88e4c4
tooltips for file upload
8 years ago
726302a9ee
Spanish update
8 years ago
3f85471ab3
update footer and package.json for upcoming version
8 years ago
66b076111e
Add an upload button to the slide's file picker
8 years ago
a237eec41e
Add a file picker in the slide app
8 years ago
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a98353af6c
Add a button to upload a file in the drive
8 years ago
9870169e03
remove a few elements from CKEditor config
8 years ago
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f9c26645cf
Upload images using the slide app
8 years ago
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
8 years ago
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
8 years ago
0004be521c
change translation
8 years ago
49370764c1
change whiteboard translation
8 years ago
376b60c21c
New toolbar temp
8 years ago
685b352db8
poll: Add show help button
8 years ago
8471dab6b1
Provide hints in theme and language dropdowns
8 years ago
621376b0fa
small fixes
8 years ago
cce665a18b
spanish updates
8 years ago
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
8 years ago
6a96aa6819
Disconnect the network when migrating the drive in another tab
8 years ago
2f851ab97e
fix lint errors
8 years ago
f1271bfd03
Missing file
8 years ago
5641a4a839
Add the file app in the 'new' dropdown menus
8 years ago
ac91d2f413
Fix the upgrade and donate buttons in the home page
8 years ago
ee57458158
Remove the pin limit alert
8 years ago
85f1fb86d0
Add missing french translation keys
8 years ago
f43132a63b
bump version in footer and package.json
8 years ago
ec9a4dec5e
Merge branch 'soon' into staging
8 years ago
8d4017b79e
fix parse error
8 years ago
b9b8352633
Traditional Chinese
8 years ago
767793b5ca
fix stuck loading tip
8 years ago
d774f8771b
remove more unused files
8 years ago
540304807c
remove unused files
8 years ago
daf112a5b5
take api settings into account for upgrade button
8 years ago
ebfa228bc0
add upgrade button to all static pages
8 years ago
909bc2ebf3
add new translation key
8 years ago
81b931e56f
Update messages.pt-br.js
8 years ago
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
75874424cf
add 'support cryptpad' translation key
8 years ago
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
8 years ago
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
92a7970eb8
fix merge conflicts
8 years ago
0a92719763
spanish! new keys ahoy
8 years ago
6518b56945
poll: french messages
8 years ago
3915b30055
provide a register button on login
...
also direct users from file to login
8 years ago
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
8 years ago
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6573813523
Merge branch 'soon' into staging
8 years ago
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
8 years ago
1092285a68
merge master
8 years ago
6c1861dbc6
Merge branch 'soon' into staging
8 years ago
0559b8cb77
Update messages.ro.js
8 years ago
70fbbe0078
Update messages.ro.js
8 years ago
bc26f7fc4e
Merge branch 'soon' into staging
8 years ago
70c1061f47
Fix romanian translation
8 years ago
83c0a6d37d
Romanian translation
8 years ago
b281d51d90
Fix typos in the french translation
8 years ago
38bd6b3808
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
964d046154
Update a french translation key
8 years ago
cf83cab596
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0a646a9534
remove unnecessary space
8 years ago
6ddfe0e901
Fix new lines in /pad userlist
8 years ago
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d55b7e411c
Display an alert in the drive when the limit is reached
8 years ago
2ca6277660
enable pin limits by default
8 years ago
c45f08f147
Use a download button instead of downloading a file automatically
8 years ago
0c2f84058b
Improve css for the file app
8 years ago
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
538aec6ef5
Display a message when pinPads returns an error
8 years ago
af4fd3c6d3
resolve merge conflicts
8 years ago
1ab6eb3c5d
Add a queue for multiple uploads in the file app
8 years ago
ba5ef5157e
show pretty representations of storage usage
8 years ago
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e7a458295b
new translation keys for file upload
8 years ago
814c81fb13
Display an alert when CryptPad has a new version
8 years ago
21f9e31e75
Add a placeholder for the user app
8 years ago
620f4dc512
Add translations for the markdown preview button title
8 years ago
3ba94a1ba2
correctly set release version number
8 years ago
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d13dde856a
Add the markdown renderer file and change code's default content
8 years ago
4debec39bb
update footer with next release codename and corrected matrix link
8 years ago
517438d7c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
81af9225fc
template a Romanian translation
8 years ago
e8275c02c6
Merge pull request #115 from pbondoer/spanish
...
Spanish update
8 years ago
ad6217f064
file upload spanish keys
8 years ago
827233dcba
new translation keys for file upload
8 years ago
dc2cdb7c08
Add the usage bar in the settings page
8 years ago
716245f864
Make all the buttons look the same
8 years ago
0f37d9def7
Change the button font size in the toolbar
8 years ago
48496416e7
Use the same font-size for all the toolbar buttons
8 years ago
03274c3776
Display an info message in the anonymous drive
8 years ago
ad5e18f558
Spanish update
8 years ago
601226115b
New anonymous drive
8 years ago
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
8 years ago
5a21be8112
Improve UI on mobile
8 years ago
ca6f910f0b
Add french translations for 'log out everywhere'
8 years ago
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6847906ac9
Move the userlist code in a separate file
8 years ago
6909f663b6
modify 'log out everywhere' text
8 years ago
a173e4c7a0
add 'log out everywhere' functionality in settings
8 years ago
c07d3e6162
update version strings for upcoming release
8 years ago
3e118c6a38
allow instance-wide custom salt for login
8 years ago
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
78b11584f8
remove unused variables
8 years ago
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a190c99426
Toolbar refactoring
8 years ago
410a9dfb17
temporary solution for testing pin limits
8 years ago
ef89451a83
Display the storage limit in the drive
8 years ago
f414d480a9
Add the history mode to the CryptDrive
8 years ago
16f6ab813c
Make it clear that the number is the history represents a version
8 years ago
0ee228666b
Replace the IRC link by the Matrix one
8 years ago
ab1dc48b6d
Fix the 'limit reached' icon in the pad app
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
f50aa5c29b
Move the mediatag viewer into a media app
8 years ago
9882a3a923
Add support for the file applicaiton in the drive
8 years ago
e40203480f
Merge pull request #113 from pbondoer/staging
...
Update spanish
8 years ago
a5ca461a73
update footer for new version
8 years ago
ba407322e8
Update spanish
8 years ago
3e28d1b966
Add a missing key in the french translation
8 years ago
9abfadb32f
Update french translation
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
df9c312b7d
make new text translateable
8 years ago
8f352c8433
add justify plugin to default ckeditor config
8 years ago
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
8 years ago
7a05462eb3
Some more poll changes <3
8 years ago
50793f506d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
43c045721c
Get the channel history
8 years ago
eed5b1260d
set font-size label to match other ckeditor font sizes
8 years ago
0db603f580
spanish pinpad
8 years ago
84dd879abb
add messages for settings page
8 years ago
4c7022ade9
Merge pull request #109 from pbondoer/spanish
...
Espanol!
8 years ago
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
8 years ago
65e848fd4d
linter linted the lints
8 years ago
40c06c4515
Spanish!
8 years ago
3e421c7289
Fix lint errors in ckeditor config
8 years ago
2ad0a65b71
Remove shortcuts that override browser actions
8 years ago
f11cf8e6ac
move poll styles to separate file
8 years ago
cde9ea9887
update footer version
8 years ago
d5e69653c0
Select opacity in draw mode in the canvas app
8 years ago
cfc5d634f4
Merge branch 'templates' into staging
8 years ago
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
8 years ago
63a130c678
Add a button to delete the selection in canvas
8 years ago
84d8615cf1
Save and use templates in pad, code and slides
8 years ago
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
8 years ago
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
8 years ago
2ecabbe6e3
add brown and pink to the palette
8 years ago
6e1ffcc18d
define better color palette
8 years ago
46a5eee597
Display the spinner in the toolbar for local changes
8 years ago
fe7f7f4e6d
Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging
8 years ago
90612bc5ba
Update messages.pt-br.js
8 years ago
5a85e4464c
fix poor visibility on green pencils
8 years ago
7908f3b4f0
make sure green UI elements use the same green
8 years ago
36b02d71f5
add ckeditor indentblock plugin.
...
closes #101
8 years ago
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
8 years ago
364dae2882
update templated html
8 years ago
a3a0592e5e
add English and French keys for the whiteboard app
8 years ago
6186953a12
make whiteboard a default app
8 years ago
df7363f416
regenerate templated files for new footer
8 years ago
b50b76bf81
remove unnecessary lines
8 years ago
d92a875ce5
Translate the 'wrong application' error message
8 years ago
69edce5491
remove unused translation keys
8 years ago
53c60a31f6
Set the properties and backup inputs to read-only in the drive
8 years ago
ff60dd4399
Translate settings_publicSigningKey in french
8 years ago
b176426213
increase default ckeditor font size to 16px
8 years ago
3e9eb03e5a
display a user's public signing key in settings if it exists
8 years ago
d1c32ea1f8
define english, french, and spanish labels for whiteboard app
8 years ago
f301592a83
Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish
8 years ago
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ef0e1d7aa0
add a non-breaking space to pad initialState
8 years ago
Caleb James DeLisle