ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
2017-04-13 18:04:13 +02:00 |
|
Pierre Bondoerffer
|
65e848fd4d
|
linter linted the lints
|
2017-04-13 17:50:28 +02:00 |
|
Pierre Bondoerffer
|
40c06c4515
|
Spanish!
|
2017-04-13 17:42:38 +02:00 |
|
yflory
|
3e421c7289
|
Fix lint errors in ckeditor config
|
2017-04-13 17:09:35 +02:00 |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
2017-04-13 16:43:07 +02:00 |
|
Pierre Bondoerffer
|
f11cf8e6ac
|
move poll styles to separate file
|
2017-04-13 14:14:12 +02:00 |
|
ansuz
|
cde9ea9887
|
update footer version
|
2017-04-10 18:09:22 +02:00 |
|
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
2017-04-10 17:03:50 +02:00 |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
2017-04-10 14:19:48 +02:00 |
|
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
2017-04-10 14:19:15 +02:00 |
|
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
2017-04-10 11:55:39 +02:00 |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
2017-04-07 18:20:03 +02:00 |
|
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
2017-04-07 17:24:25 +02:00 |
|
yflory
|
a13261abaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-07 14:54:13 +02:00 |
|
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
2017-04-07 14:54:02 +02:00 |
|
ansuz
|
2ecabbe6e3
|
add brown and pink to the palette
|
2017-04-06 19:05:06 +02:00 |
|
ansuz
|
6e1ffcc18d
|
define better color palette
|
2017-04-06 18:45:40 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
fe7f7f4e6d
|
Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging
|
2017-04-05 10:36:23 +02:00 |
|
Gustavo H M Silva
|
90612bc5ba
|
Update messages.pt-br.js
|
2017-04-03 18:43:30 -03:00 |
|
ansuz
|
5a85e4464c
|
fix poor visibility on green pencils
|
2017-03-30 18:05:08 +02:00 |
|
ansuz
|
7908f3b4f0
|
make sure green UI elements use the same green
|
2017-03-30 15:50:06 +02:00 |
|
ansuz
|
36b02d71f5
|
add ckeditor indentblock plugin.
closes #101
|
2017-03-30 10:55:22 +02:00 |
|
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
2017-03-29 16:02:04 +02:00 |
|
ansuz
|
364dae2882
|
update templated html
|
2017-03-29 12:56:08 +02:00 |
|
ansuz
|
a3a0592e5e
|
add English and French keys for the whiteboard app
|
2017-03-29 11:54:46 +02:00 |
|
ansuz
|
6186953a12
|
make whiteboard a default app
|
2017-03-29 11:54:19 +02:00 |
|
ansuz
|
df7363f416
|
regenerate templated files for new footer
|
2017-03-28 11:50:42 +02:00 |
|
ansuz
|
b50b76bf81
|
remove unnecessary lines
|
2017-03-27 18:13:21 +02:00 |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
2017-03-27 11:34:54 +02:00 |
|
ansuz
|
69edce5491
|
remove unused translation keys
|
2017-03-27 11:29:19 +02:00 |
|
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
2017-03-27 11:14:37 +02:00 |
|
yflory
|
ff60dd4399
|
Translate settings_publicSigningKey in french
|
2017-03-27 10:32:13 +02:00 |
|
ansuz
|
b176426213
|
increase default ckeditor font size to 16px
|
2017-03-24 14:55:29 +01:00 |
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
2017-03-24 14:26:36 +01:00 |
|
ansuz
|
d1c32ea1f8
|
define english, french, and spanish labels for whiteboard app
|
2017-03-23 16:50:37 +01:00 |
|
ansuz
|
f301592a83
|
Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish
|
2017-03-20 18:08:08 +01:00 |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
|
ansuz
|
ef0e1d7aa0
|
add a non-breaking space to pad initialState
|
2017-03-20 18:05:07 +01:00 |
|
yflory
|
29174b2922
|
Update the lag icon
|
2017-03-20 16:39:33 +01:00 |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
2017-03-20 15:20:42 +01:00 |
|
Pierre Bondoerffer
|
0efb3c993c
|
fixed lint :(
|
2017-03-17 18:10:37 +01:00 |
|
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
2017-03-17 18:03:00 +01:00 |
|
Pierre Bondoerffer
|
3c60ebcc97
|
Update Spanish
|
2017-03-17 18:02:48 +01:00 |
|
yflory
|
a5f11d0d0d
|
Uniform the slides rendering in present and print mode
|
2017-03-17 15:30:27 +01:00 |
|
yflory
|
7761aaa89f
|
Add search UI
|
2017-03-16 14:16:42 +01:00 |
|
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:38 +01:00 |
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
2017-03-15 18:57:13 +01:00 |
|
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
2017-03-15 17:20:08 +01:00 |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
2017-03-15 17:14:49 +01:00 |
|
ansuz
|
dcc4e0dc6b
|
remove extraneous translation
|
2017-03-14 14:35:27 +01:00 |
|
ansuz
|
805e26bc07
|
add a version footer to main pages
|
2017-03-14 14:34:13 +01:00 |
|
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
2017-03-14 12:49:22 +01:00 |
|
yflory
|
bc35fc86cf
|
Translate the 'alreadyRegistered' error in french
|
2017-03-14 12:42:00 +01:00 |
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
ansuz
|
fcbe3a5224
|
add already registered message to english translation
|
2017-03-14 12:40:19 +01:00 |
|
yflory
|
36a2eab3c3
|
Add French translation for the new register process
|
2017-03-14 12:05:12 +01:00 |
|
ansuz
|
11ff3f5347
|
new styles for alertify dialogs
|
2017-03-14 12:02:12 +01:00 |
|
ansuz
|
bbe2279b9c
|
add new translations for registration
|
2017-03-14 11:02:14 +01:00 |
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 19:32:15 +01:00 |
|
ansuz
|
0d30a1e00f
|
add safe and danger classes to alertify styles
|
2017-03-13 19:32:10 +01:00 |
|
Pierre Bondoerffer
|
3ad8b4023d
|
Spanish update 🇪🇸
|
2017-03-13 15:50:20 +01:00 |
|
yflory
|
e761dc27c2
|
French translation for feedback
|
2017-03-13 13:04:55 +01:00 |
|
ansuz
|
a16e6850d4
|
add translation keys for the feedback page
|
2017-03-13 12:54:59 +01:00 |
|
yflory
|
c00010177d
|
Add tips in the loading screen
|
2017-03-13 12:41:15 +01:00 |
|
ansuz
|
95a51e8fe4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 12:16:06 +01:00 |
|
ansuz
|
ff3641134f
|
update pad initialState
|
2017-03-13 12:16:01 +01:00 |
|
yflory
|
275900f5ff
|
Translate new initial states for pad and code
|
2017-03-13 12:15:53 +01:00 |
|
yflory
|
4a762fec99
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 11:53:24 +01:00 |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
2017-03-13 11:52:48 +01:00 |
|
ansuz
|
1178660815
|
update code initialState string
|
2017-03-13 11:52:33 +01:00 |
|
yflory
|
2e418c1723
|
When the browser returns a regional language, check if the language code is available
|
2017-03-10 17:03:30 +01:00 |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
2017-03-10 16:46:36 +01:00 |
|
yflory
|
2392167996
|
Export slides as PDF
|
2017-03-09 19:05:44 +01:00 |
|
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
2017-03-08 16:47:38 +01:00 |
|
yflory
|
a8d200ef2e
|
Don't redirect until realtime is synced when logging in
|
2017-03-08 16:15:31 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
2017-03-06 14:56:41 +01:00 |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
2017-03-06 12:20:23 +01:00 |
|
yflory
|
f61f284e44
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:14:59 +01:00 |
|
yflory
|
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 |
|
ansuz
|
6e72c6a51b
|
remove unused dependencies
|
2017-03-03 17:15:33 +01:00 |
|
Pierre Bondoerffer
|
616d265b8d
|
Remove unused French keys
|
2017-03-02 18:43:06 +01:00 |
|
Pierre Bondoerffer
|
30faef613a
|
Update Spanish
|
2017-03-02 18:41:14 +01:00 |
|
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:44:29 +01:00 |
|
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:09:39 +01:00 |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
2017-03-02 17:01:27 +01:00 |
|
Pierre Bondoerffer
|
e8a82c4c10
|
(CSS) Toolbar buttons are now always black on white independent of system theme
|
2017-03-02 16:35:30 +01:00 |
|
Pierre Bondoerffer
|
fa59f1000e
|
(CSS) Fix title input in pads
|
2017-03-02 16:33:17 +01:00 |
|
yflory
|
2b20eef464
|
Fix userlist in /pad
|
2017-03-02 12:28:01 +01:00 |
|
ansuz
|
e3f26263f4
|
remove red outline on images in slide
|
2017-03-02 11:28:20 +01:00 |
|
ansuz
|
c9040997d5
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 11:07:17 +01:00 |
|
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
2017-03-02 10:15:13 +01:00 |
|
Caleb James DeLisle
|
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 |
|
ansuz
|
9800f036c5
|
fix a typo
|
2017-03-01 17:06:18 +01:00 |
|
ansuz
|
84a4a15c46
|
fix inverted checkbox description
|
2017-02-28 18:58:20 +01:00 |
|
Pierre Bondoerffer
|
f11b03c16e
|
Spanish translation updated 🎉
|
2017-02-28 18:47:58 +01:00 |
|
yflory
|
f130fd0598
|
Fix horizontal scrollbar in edge
|
2017-02-28 18:02:12 +01:00 |
|
yflory
|
345d2faab2
|
Fix horizontal scrollbar in Edge #3
|
2017-02-28 17:13:51 +01:00 |
|
yflory
|
d683dc499a
|
Fix horizontal scrollbar in Edge #2
|
2017-02-28 17:03:23 +01:00 |
|
yflory
|
7a0a87bf6c
|
Fix horizontal scrollbar in Edge
|
2017-02-28 16:38:51 +01:00 |
|
ansuz
|
3bf85b113c
|
don't hide overflow, that causes worse problems
|
2017-02-28 16:37:34 +01:00 |
|
yflory
|
65202bd619
|
Fix french translation with the drive readme
|
2017-02-28 15:02:11 +01:00 |
|
ansuz
|
3380b13c95
|
remove horizontal scroll on edge
|
2017-02-28 12:29:53 +01:00 |
|
ansuz
|
10c41369de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 12:25:40 +01:00 |
|
ansuz
|
8c87255267
|
remove any mention of piwik
|
2017-02-28 12:25:31 +01:00 |
|
yflory
|
8007f51655
|
Update french translation
|
2017-02-28 12:01:32 +01:00 |
|
yflory
|
1c7561f37e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 11:51:23 +01:00 |
|
yflory
|
6967b67485
|
Update french translation suing new best practices
|
2017-02-28 11:51:18 +01:00 |
|
ansuz
|
569d25f25f
|
update some translation keys in English
|
2017-02-28 11:50:07 +01:00 |
|
ansuz
|
b87c9d4ba6
|
fix merge conflicts with usability branch
|
2017-02-28 11:35:29 +01:00 |
|
ansuz
|
5a49e276b5
|
add settings_anonymous key
|
2017-02-28 11:32:14 +01:00 |
|
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
2017-02-28 11:23:50 +01:00 |
|
ansuz
|
69b6f80e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 10:47:23 +01:00 |
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
2017-02-28 10:47:18 +01:00 |
|
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
2017-02-28 10:39:48 +01:00 |
|
yflory
|
ccd195d318
|
Translate user feedback keys in french
|
2017-02-28 10:28:07 +01:00 |
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 20:11:26 +01:00 |
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
2017-02-27 20:11:18 +01:00 |
|
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 17:23:40 +01:00 |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
2017-02-27 17:23:28 +01:00 |
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:32:04 +01:00 |
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
2017-02-27 14:31:56 +01:00 |
|
ansuz
|
4941674cf7
|
initialize allowUserFeedback to true if it is not defined
|
2017-02-27 14:31:00 +01:00 |
|
yflory
|
95853debf9
|
Update the default pad #1
|
2017-02-27 14:29:48 +01:00 |
|
yflory
|
38893fb8e5
|
Remove the 'Bootstart tooltips require Tether' error
|
2017-02-27 11:19:29 +01:00 |
|
yflory
|
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 |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
2017-02-24 15:22:26 +01:00 |
|
ansuz
|
9ccb473b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
|
2017-02-24 12:06:17 +01:00 |
|
ansuz
|
252fc7a640
|
uppercase messages
|
2017-02-24 11:52:21 +01:00 |
|
ansuz
|
20689b1dec
|
update english translation for usability feedback
|
2017-02-23 16:11:39 +01:00 |
|
yflory
|
2d30393243
|
Add support for updated translation key
|
2017-02-23 11:45:00 +01:00 |
|
ansuz
|
f168433db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-22 17:41:06 +01:00 |
|
ansuz
|
d0b7576d84
|
make slide present mode exit button clickable at all sizes
|
2017-02-22 17:40:44 +01:00 |
|
yflory
|
bdc00a2413
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-22 12:25:48 +01:00 |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
2017-02-22 12:25:29 +01:00 |
|
ansuz
|
1494387c9f
|
ignore a line for jshint
|
2017-02-22 11:17:12 +01:00 |
|
yflory
|
e73b4a1131
|
Don't display 'All files' in the menu
|
2017-02-22 11:15:29 +01:00 |
|
ansuz
|
33e2c8676e
|
assign updated key to what it should actually be
|
2017-02-22 11:15:25 +01:00 |
|
ansuz
|
641c805518
|
unbreak ckeditor
|
2017-02-21 18:59:42 +01:00 |
|
ansuz
|
fac5a043ca
|
Merge pull request #88 from pbondoer/staging
Update Spanish translation 🇪🇸
|
2017-02-21 18:54:09 +01:00 |
|
yflory
|
e5179a1b3f
|
Translate pad initial state in french
|
2017-02-21 18:48:01 +01:00 |
|
Pierre Bondoerffer
|
328e3e71d9
|
Some UI fixes for Spanish
|
2017-02-21 18:47:32 +01:00 |
|
yflory
|
2e378564d0
|
Make the 'pad' initial state translatable
|
2017-02-21 18:43:26 +01:00 |
|
ansuz
|
c0989f64fa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-21 18:21:39 +01:00 |
|
ansuz
|
3d0e7cb9a7
|
pull ckeditor config out of main.js
|
2017-02-21 18:21:30 +01:00 |
|
yflory
|
81fbe0fdd1
|
Add back some translation keys that shouldn't have been removed
|
2017-02-21 18:21:11 +01:00 |
|