c2e153e8ed
more fouc fixes
2017-06-30 16:20:10 +02:00
8ffad5ece6
FOUC fixes
2017-06-30 16:10:42 +02:00
b6944e6638
Fix userlist style in apps without iframe
2017-06-30 13:13:11 +02:00
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
0b9d7d6c0b
fix color of links in poll and whiteboard
2017-06-29 16:51:44 +02:00
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
c53ebe3598
bring upload status container to the front
2017-06-28 16:33:00 +02:00
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
7de2683169
make all apps use clientside templates
2017-06-27 18:17:52 +02:00
bdca6b10c2
use templates in poll.js
2017-06-27 15:38:12 +02:00
3a9b480e4e
resolve merge conflicts in template.js
2017-06-27 14:28:28 +02:00
40f4fc2682
Add the profile app in template.js
2017-06-27 14:27:54 +02:00
9b6790534f
remove grey text from ckeditor initialState
2017-06-27 14:26:09 +02:00
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
c431041e3f
Fix position of the rightside drawer with small screen
2017-06-26 15:53:29 +02:00
36ef4178dc
Remove the editable title from the file app
2017-06-26 15:16:17 +02:00
c364803406
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 11:25:06 +02:00
805e604e53
Add missing icons
2017-06-26 11:24:49 +02:00
f181e8db60
correct parentheses
2017-06-26 10:45:27 +02:00
f4fdb7040c
Optimize image assets to speedup page loading
2017-06-25 20:14:23 +02:00
6af4335ead
Translated up to page 317
...
Translated up to page 317
2017-06-23 14:28:00 -03:00
ce44a8d351
Fix the backup button in anonymous drive
2017-06-23 18:02:36 +02:00
06a0590f73
New folder icons
2017-06-23 17:58:41 +02:00
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 16:15:08 +02:00
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
bd1db735dd
jshint compliance
2017-06-22 16:02:20 +02:00
35bfa1dce4
test client-side templates in whiteboard app
2017-06-22 16:01:33 +02:00
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
dcfc59c2e2
Translation key updated
2017-06-22 11:21:37 +02:00
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
3657e978fd
give main2.js a more sensible name
2017-06-22 11:06:11 +02:00
e86ef209a8
define loading screen markup in js
2017-06-22 11:04:21 +02:00
118b83c420
make register and login user clientside templates
2017-06-22 10:04:46 +02:00
6dacbf2bd9
add translations and some improvements
2017-06-21 21:38:56 +02:00
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
f13d23241c
Upgrade CkEditor to version 4.7
2017-06-20 10:03:13 +02:00
9be23be5eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 18:09:57 +02:00
b80d7513aa
skip over the terms of service link
2017-06-19 18:03:39 +02:00
1275f3f3a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 17:59:18 +02:00
f5da7ae42e
Add a new loading tip in french
2017-06-19 17:59:12 +02:00
e2ff88e4c4
tooltips for file upload
2017-06-19 17:56:19 +02:00
726302a9ee
Spanish update
2017-06-19 15:05:17 +02:00
3f85471ab3
update footer and package.json for upcoming version
2017-06-15 16:13:33 +02:00
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
9870169e03
remove a few elements from CKEditor config
2017-06-14 15:39:33 +02:00
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
2017-06-13 14:32:46 +02:00
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
2017-06-13 14:23:41 +02:00
0004be521c
change translation
2017-06-13 14:21:22 +02:00
49370764c1
change whiteboard translation
2017-06-12 18:14:33 +02:00
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
685b352db8
poll: Add show help button
2017-06-12 14:25:10 +02:00
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
621376b0fa
small fixes
2017-06-09 17:44:13 +02:00
cce665a18b
spanish updates
2017-06-09 17:42:25 +02:00
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
2f851ab97e
fix lint errors
2017-06-07 10:13:51 +02:00
f1271bfd03
Missing file
2017-06-06 11:56:22 +02:00
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
85f1fb86d0
Add missing french translation keys
2017-06-06 10:28:00 +02:00
f43132a63b
bump version in footer and package.json
2017-06-06 10:01:07 +02:00
ec9a4dec5e
Merge branch 'soon' into staging
2017-06-05 11:43:26 +02:00
8d4017b79e
fix parse error
2017-06-05 11:35:05 +02:00
b9b8352633
Traditional Chinese
2017-06-05 15:10:13 +08:00
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
d774f8771b
remove more unused files
2017-05-31 12:23:31 +02:00
540304807c
remove unused files
2017-05-31 12:11:33 +02:00
daf112a5b5
take api settings into account for upgrade button
2017-05-30 20:11:15 +02:00
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
909bc2ebf3
add new translation key
2017-05-30 15:39:13 +02:00
81b931e56f
Update messages.pt-br.js
2017-05-30 09:45:14 -03:00
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-30 10:46:17 +02:00
75874424cf
add 'support cryptpad' translation key
2017-05-30 10:41:46 +02:00
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
2017-05-29 15:19:04 -03:00
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.
2017-05-29 14:43:15 -03:00
92a7970eb8
fix merge conflicts
2017-05-29 19:04:47 +02:00
0a92719763
spanish! new keys ahoy
2017-05-29 18:25:18 +02:00
6518b56945
poll: french messages
2017-05-29 16:50:25 +02:00
3915b30055
provide a register button on login
...
also direct users from file to login
2017-05-29 13:11:07 +02:00
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
2017-05-29 12:59:49 +02:00
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-29 11:33:03 +02:00
6573813523
Merge branch 'soon' into staging
2017-05-29 11:32:54 +02:00
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
1092285a68
merge master
2017-05-26 16:18:51 +02:00
6c1861dbc6
Merge branch 'soon' into staging
2017-05-26 15:48:44 +02:00
0559b8cb77
Update messages.ro.js
2017-05-26 16:47:45 +03:00
70fbbe0078
Update messages.ro.js
2017-05-25 10:23:27 +03:00
bc26f7fc4e
Merge branch 'soon' into staging
2017-05-24 15:04:40 +02:00
70c1061f47
Fix romanian translation
2017-05-24 14:49:00 +02:00
83c0a6d37d
Romanian translation
2017-05-24 14:37:13 +02:00
b281d51d90
Fix typos in the french translation
2017-05-23 15:04:18 +02:00
38bd6b3808
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 14:50:42 +02:00
964d046154
Update a french translation key
2017-05-23 14:50:28 +02:00
cf83cab596
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 12:35:54 +02:00
0a646a9534
remove unnecessary space
2017-05-23 12:35:49 +02:00
6ddfe0e901
Fix new lines in /pad userlist
2017-05-23 12:14:31 +02:00
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 18:43:14 +02:00
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
2ca6277660
enable pin limits by default
2017-05-22 16:50:32 +02:00
c45f08f147
Use a download button instead of downloading a file automatically
2017-05-22 11:43:45 +02:00
0c2f84058b
Improve css for the file app
2017-05-22 11:16:01 +02:00
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 10:41:55 +02:00
538aec6ef5
Display a message when pinPads returns an error
2017-05-22 10:41:47 +02:00
af4fd3c6d3
resolve merge conflicts
2017-05-19 19:14:08 +02:00
1ab6eb3c5d
Add a queue for multiple uploads in the file app
2017-05-19 18:41:34 +02:00
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
e7a458295b
new translation keys for file upload
2017-05-19 09:10:36 +02:00
814c81fb13
Display an alert when CryptPad has a new version
2017-05-18 18:51:08 +02:00
21f9e31e75
Add a placeholder for the user app
2017-05-18 15:56:35 +02:00
620f4dc512
Add translations for the markdown preview button title
2017-05-18 15:05:37 +02:00
3ba94a1ba2
correctly set release version number
2017-05-18 14:54:02 +02:00
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:27:10 +02:00
d13dde856a
Add the markdown renderer file and change code's default content
2017-05-18 14:26:56 +02:00
4debec39bb
update footer with next release codename and corrected matrix link
2017-05-18 12:58:49 +02:00
517438d7c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-16 14:33:34 +02:00
81af9225fc
template a Romanian translation
2017-05-16 14:32:54 +02:00
e8275c02c6
Merge pull request #115 from pbondoer/spanish
...
Spanish update
2017-05-16 14:23:06 +02:00
ad6217f064
file upload spanish keys
2017-05-16 14:05:36 +02:00
827233dcba
new translation keys for file upload
2017-05-16 14:01:06 +02:00
dc2cdb7c08
Add the usage bar in the settings page
2017-05-15 18:16:22 +02:00
716245f864
Make all the buttons look the same
2017-05-15 16:16:50 +02:00
0f37d9def7
Change the button font size in the toolbar
2017-05-15 14:53:51 +02:00
48496416e7
Use the same font-size for all the toolbar buttons
2017-05-15 14:46:17 +02:00
03274c3776
Display an info message in the anonymous drive
2017-05-15 13:54:03 +02:00
ad5e18f558
Spanish update
2017-05-15 12:05:50 +02:00
601226115b
New anonymous drive
2017-05-12 18:06:29 +02:00
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
2017-05-11 10:58:33 +02:00
5a21be8112
Improve UI on mobile
2017-05-10 15:54:09 +02:00
ca6f910f0b
Add french translations for 'log out everywhere'
2017-05-09 10:32:41 +02:00
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:57:05 +02:00
6847906ac9
Move the userlist code in a separate file
2017-05-05 15:47:46 +02:00
6909f663b6
modify 'log out everywhere' text
2017-05-05 15:18:32 +02:00
a173e4c7a0
add 'log out everywhere' functionality in settings
2017-05-05 15:09:07 +02:00
c07d3e6162
update version strings for upcoming release
2017-05-05 11:51:41 +02:00
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:16:16 +02:00
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:08:21 +02:00
a190c99426
Toolbar refactoring
2017-05-04 16:08:12 +02:00
410a9dfb17
temporary solution for testing pin limits
2017-05-04 11:20:52 +02:00
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
f414d480a9
Add the history mode to the CryptDrive
2017-04-28 18:23:41 +02:00
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
0ee228666b
Replace the IRC link by the Matrix one
2017-04-28 12:40:39 +02:00
ab1dc48b6d
Fix the 'limit reached' icon in the pad app
2017-04-28 12:32:49 +02:00
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
f50aa5c29b
Move the mediatag viewer into a media app
2017-04-26 14:55:06 +02:00
9882a3a923
Add support for the file applicaiton in the drive
2017-04-25 18:42:21 +02:00
e40203480f
Merge pull request #113 from pbondoer/staging
...
Update spanish
2017-04-24 16:09:53 +02:00
a5ca461a73
update footer for new version
2017-04-24 15:41:29 +02:00
ba407322e8
Update spanish
2017-04-24 15:16:30 +02:00
3e28d1b966
Add a missing key in the french translation
2017-04-24 14:41:55 +02:00
9abfadb32f
Update french translation
2017-04-24 14:39:30 +02:00
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
df9c312b7d
make new text translateable
2017-04-18 18:31:58 +02:00
8f352c8433
add justify plugin to default ckeditor config
2017-04-18 15:49:31 +02:00
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
2017-04-18 12:14:32 +02:00
7a05462eb3
Some more poll changes <3
2017-04-14 19:34:58 +02:00
50793f506d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-14 18:44:20 +02:00
43c045721c
Get the channel history
2017-04-14 18:36:36 +02:00
eed5b1260d
set font-size label to match other ckeditor font sizes
2017-04-14 18:20:40 +02:00
0db603f580
spanish pinpad
2017-04-14 17:59:08 +02:00
84dd879abb
add messages for settings page
2017-04-14 17:22:00 +02:00
4c7022ade9
Merge pull request #109 from pbondoer/spanish
...
Espanol!
2017-04-13 18:10:35 +02:00
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
2017-04-13 18:04:13 +02:00
65e848fd4d
linter linted the lints
2017-04-13 17:50:28 +02:00
40c06c4515
Spanish!
2017-04-13 17:42:38 +02:00
3e421c7289
Fix lint errors in ckeditor config
2017-04-13 17:09:35 +02:00
2ad0a65b71
Remove shortcuts that override browser actions
2017-04-13 16:43:07 +02:00
f11cf8e6ac
move poll styles to separate file
2017-04-13 14:14:12 +02:00
cde9ea9887
update footer version
2017-04-10 18:09:22 +02:00
d5e69653c0
Select opacity in draw mode in the canvas app
2017-04-10 17:03:50 +02:00
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
63a130c678
Add a button to delete the selection in canvas
2017-04-10 11:55:39 +02:00
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 14:54:13 +02:00
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
2017-04-07 14:54:02 +02:00
2ecabbe6e3
add brown and pink to the palette
2017-04-06 19:05:06 +02:00
6e1ffcc18d
define better color palette
2017-04-06 18:45:40 +02:00
46a5eee597
Display the spinner in the toolbar for local changes
2017-04-05 14:57:07 +02:00
fe7f7f4e6d
Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging
2017-04-05 10:36:23 +02:00
90612bc5ba
Update messages.pt-br.js
2017-04-03 18:43:30 -03:00
5a85e4464c
fix poor visibility on green pencils
2017-03-30 18:05:08 +02:00
7908f3b4f0
make sure green UI elements use the same green
2017-03-30 15:50:06 +02:00
36b02d71f5
add ckeditor indentblock plugin.
...
closes #101
2017-03-30 10:55:22 +02:00
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
2017-03-29 16:02:04 +02:00
364dae2882
update templated html
2017-03-29 12:56:08 +02:00
a3a0592e5e
add English and French keys for the whiteboard app
2017-03-29 11:54:46 +02:00
6186953a12
make whiteboard a default app
2017-03-29 11:54:19 +02:00
df7363f416
regenerate templated files for new footer
2017-03-28 11:50:42 +02:00
b50b76bf81
remove unnecessary lines
2017-03-27 18:13:21 +02:00
d92a875ce5
Translate the 'wrong application' error message
2017-03-27 11:34:54 +02:00
69edce5491
remove unused translation keys
2017-03-27 11:29:19 +02:00
53c60a31f6
Set the properties and backup inputs to read-only in the drive
2017-03-27 11:14:37 +02:00
ff60dd4399
Translate settings_publicSigningKey in french
2017-03-27 10:32:13 +02:00
b176426213
increase default ckeditor font size to 16px
2017-03-24 14:55:29 +01:00
3e9eb03e5a
display a user's public signing key in settings if it exists
2017-03-24 14:26:36 +01:00
d1c32ea1f8
define english, french, and spanish labels for whiteboard app
2017-03-23 16:50:37 +01:00
f301592a83
Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish
2017-03-20 18:08:08 +01:00
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-20 18:05:39 +01:00
ef0e1d7aa0
add a non-breaking space to pad initialState
2017-03-20 18:05:07 +01:00
29174b2922
Update the lag icon
2017-03-20 16:39:33 +01:00
26edb77cf0
Fix style and usability issues in slides
2017-03-20 15:20:42 +01:00
0efb3c993c
fixed lint :(
2017-03-17 18:10:37 +01:00
45ac3e40a2
Copy print options to present mode
2017-03-17 18:03:00 +01:00
3c60ebcc97
Update Spanish
2017-03-17 18:02:48 +01:00
a5f11d0d0d
Uniform the slides rendering in present and print mode
2017-03-17 15:30:27 +01:00
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:38 +01:00
0a6373852e
add signing keys to user object at login and register time
2017-03-15 18:57:13 +01:00
0607c3bbf3
Add a title to the 'new' button in drive
2017-03-15 17:20:08 +01:00
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
dcc4e0dc6b
remove extraneous translation
2017-03-14 14:35:27 +01:00
805e26bc07
add a version footer to main pages
2017-03-14 14:34:13 +01:00
f10149db1c
Make sure the tip is always visible when the loading screen is removed
2017-03-14 12:49:22 +01:00
bc35fc86cf
Translate the 'alreadyRegistered' error in french
2017-03-14 12:42:00 +01:00
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-14 12:40:25 +01:00
fcbe3a5224
add already registered message to english translation
2017-03-14 12:40:19 +01:00
36a2eab3c3
Add French translation for the new register process
2017-03-14 12:05:12 +01:00
11ff3f5347
new styles for alertify dialogs
2017-03-14 12:02:12 +01:00
bbe2279b9c
add new translations for registration
2017-03-14 11:02:14 +01:00
10bb11bff6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 19:32:15 +01:00
0d30a1e00f
add safe and danger classes to alertify styles
2017-03-13 19:32:10 +01:00
3ad8b4023d
Spanish update 🇪🇸
2017-03-13 15:50:20 +01:00
e761dc27c2
French translation for feedback
2017-03-13 13:04:55 +01:00
a16e6850d4
add translation keys for the feedback page
2017-03-13 12:54:59 +01:00
c00010177d
Add tips in the loading screen
2017-03-13 12:41:15 +01:00
95a51e8fe4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 12:16:06 +01:00
ff3641134f
update pad initialState
2017-03-13 12:16:01 +01:00
275900f5ff
Translate new initial states for pad and code
2017-03-13 12:15:53 +01:00
4a762fec99
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 11:53:24 +01:00
ca9faa0056
Fix wrong translation keys
2017-03-13 11:52:48 +01:00
1178660815
update code initialState string
2017-03-13 11:52:33 +01:00
2e418c1723
When the browser returns a regional language, check if the language code is available
2017-03-10 17:03:30 +01:00
f94db93897
Improve the slides layout in print mode
2017-03-10 16:46:36 +01:00
2392167996
Export slides as PDF
2017-03-09 19:05:44 +01:00
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
2017-03-08 16:47:38 +01:00
a8d200ef2e
Don't redirect until realtime is synced when logging in
2017-03-08 16:15:31 +01:00
4206382865
Fix the settings app to allow backup for unregistered users
2017-03-08 14:45:39 +01:00
d93a270336
Ability to display tips in the loading screen
2017-03-06 17:20:09 +01:00
77d09f64e1
Display anonymous users in the user list
2017-03-06 14:56:41 +01:00
cb88227e2b
Autocomplete on key press in some dropdown menus
2017-03-06 12:20:23 +01:00
f61f284e44
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-03 18:14:59 +01:00
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
2017-03-03 18:14:53 +01:00
6e72c6a51b
remove unused dependencies
2017-03-03 17:15:33 +01:00
616d265b8d
Remove unused French keys
2017-03-02 18:43:06 +01:00
30faef613a
Update Spanish
2017-03-02 18:41:14 +01:00
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:44:29 +01:00
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:09:39 +01:00
01c4d7d4a7
Merge branch 'maybe' into staging
2017-03-02 17:09:06 +01:00
c884782d57
here are some changes
2017-03-02 17:08:50 +01:00
2b6e44189d
When trying to reset the drive, tell the user if the input text is invalid
2017-03-02 17:01:27 +01:00
e8a82c4c10
(CSS) Toolbar buttons are now always black on white independent of system theme
2017-03-02 16:35:30 +01:00
fa59f1000e
(CSS) Fix title input in pads
2017-03-02 16:33:17 +01:00
2b20eef464
Fix userlist in /pad
2017-03-02 12:28:01 +01:00
e3f26263f4
remove red outline on images in slide
2017-03-02 11:28:20 +01:00
c9040997d5
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
2017-03-02 11:07:17 +01:00
8bdc8415ab
Find a pad in the drive
2017-03-02 10:15:13 +01:00
91eda5fa83
Implement stronger content-security-policy except in /pad/ which does not allow it.
...
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
9800f036c5
fix a typo
2017-03-01 17:06:18 +01:00
84a4a15c46
fix inverted checkbox description
2017-02-28 18:58:20 +01:00
f11b03c16e
Spanish translation updated 🎉
2017-02-28 18:47:58 +01:00
f130fd0598
Fix horizontal scrollbar in edge
2017-02-28 18:02:12 +01:00
345d2faab2
Fix horizontal scrollbar in Edge #3
2017-02-28 17:13:51 +01:00
d683dc499a
Fix horizontal scrollbar in Edge #2
2017-02-28 17:03:23 +01:00
7a0a87bf6c
Fix horizontal scrollbar in Edge
2017-02-28 16:38:51 +01:00
3bf85b113c
don't hide overflow, that causes worse problems
2017-02-28 16:37:34 +01:00
65202bd619
Fix french translation with the drive readme
2017-02-28 15:02:11 +01:00
3380b13c95
remove horizontal scroll on edge
2017-02-28 12:29:53 +01:00
10c41369de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 12:25:40 +01:00
8c87255267
remove any mention of piwik
2017-02-28 12:25:31 +01:00
8007f51655
Update french translation
2017-02-28 12:01:32 +01:00
1c7561f37e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 11:51:23 +01:00
6967b67485
Update french translation suing new best practices
2017-02-28 11:51:18 +01:00
569d25f25f
update some translation keys in English
2017-02-28 11:50:07 +01:00
b87c9d4ba6
fix merge conflicts with usability branch
2017-02-28 11:35:29 +01:00
5a49e276b5
add settings_anonymous key
2017-02-28 11:32:14 +01:00
4f4075ed6e
Make the settings app available to anonymous users
2017-02-28 11:23:50 +01:00
69b6f80e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 10:47:23 +01:00
86adfbf27d
update cache-busting directive in all supported apps
2017-02-28 10:47:18 +01:00
96f6b5755d
Add the blog link in the header and footer
2017-02-28 10:39:48 +01:00
ccd195d318
Translate user feedback keys in french
2017-02-28 10:28:07 +01:00
9a2ed5741a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 20:11:26 +01:00
a4913f2f4b
provide UI for disabling the user feedback api
2017-02-27 20:11:18 +01:00
20518a3e88
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 17:23:40 +01:00
f8d653406a
Add the new content for the default pad and add french translation
2017-02-27 17:23:28 +01:00
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:32:04 +01:00
06f0891d21
add allowUserFeedback toggle to settigs page
2017-02-27 14:31:56 +01:00
4941674cf7
initialize allowUserFeedback to true if it is not defined
2017-02-27 14:31:00 +01:00
95853debf9
Update the default pad #1
2017-02-27 14:29:48 +01:00
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
2017-02-27 11:19:29 +01:00
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
2017-02-24 16:51:15 +01:00
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
9ccb473b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
2017-02-24 12:06:17 +01:00
252fc7a640
uppercase messages
2017-02-24 11:52:21 +01:00
20689b1dec
update english translation for usability feedback
2017-02-23 16:11:39 +01:00
2d30393243
Add support for updated translation key
2017-02-23 11:45:00 +01:00
f168433db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 17:41:06 +01:00
d0b7576d84
make slide present mode exit button clickable at all sizes
2017-02-22 17:40:44 +01:00
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 12:25:48 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
1494387c9f
ignore a line for jshint
2017-02-22 11:17:12 +01:00
e73b4a1131
Don't display 'All files' in the menu
2017-02-22 11:15:29 +01:00
33e2c8676e
assign updated key to what it should actually be
2017-02-22 11:15:25 +01:00
641c805518
unbreak ckeditor
2017-02-21 18:59:42 +01:00
fac5a043ca
Merge pull request #88 from pbondoer/staging
...
Update Spanish translation 🇪🇸
2017-02-21 18:54:09 +01:00
e5179a1b3f
Translate pad initial state in french
2017-02-21 18:48:01 +01:00
328e3e71d9
Some UI fixes for Spanish
2017-02-21 18:47:32 +01:00
2e378564d0
Make the 'pad' initial state translatable
2017-02-21 18:43:26 +01:00
c0989f64fa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 18:21:39 +01:00
3d0e7cb9a7
pull ckeditor config out of main.js
2017-02-21 18:21:30 +01:00
81fbe0fdd1
Add back some translation keys that shouldn't have been removed
2017-02-21 18:21:11 +01:00
f08d43d2a0
Slight fixup
2017-02-21 18:02:12 +01:00
fc2aac2d1b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-02-21 18:00:27 +01:00
1438f6b84b
Update Spanish translation 🇪🇸
2017-02-21 17:56:02 +01:00
ed19c6885d
join array in messages.js
2017-02-21 17:16:56 +01:00
20b08a7847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 14:16:35 +01:00
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
5276dac7cc
safely handle keys which aren't strings
2017-02-21 12:29:47 +01:00
b55ded454b
Update README #2
2017-02-21 11:13:10 +01:00
f17b84d7e9
Update README about translations
2017-02-21 11:11:38 +01:00
3b71c8b0b5
Missing translations are now returned as an array of arrays
2017-02-21 10:53:30 +01:00
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
ansuz