ansuz
|
cf83cab596
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-23 12:35:54 +02:00 |
|
ansuz
|
0a646a9534
|
remove unnecessary space
|
2017-05-23 12:35:49 +02:00 |
|
yflory
|
6ddfe0e901
|
Fix new lines in /pad userlist
|
2017-05-23 12:14:31 +02:00 |
|
ansuz
|
4fae1b16c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-22 18:43:14 +02:00 |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
2017-05-22 17:56:27 +02:00 |
|
ansuz
|
2ca6277660
|
enable pin limits by default
|
2017-05-22 16:50:32 +02:00 |
|
yflory
|
c45f08f147
|
Use a download button instead of downloading a file automatically
|
2017-05-22 11:43:45 +02:00 |
|
yflory
|
0c2f84058b
|
Improve css for the file app
|
2017-05-22 11:16:01 +02:00 |
|
yflory
|
9c00a730f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-22 10:41:55 +02:00 |
|
yflory
|
538aec6ef5
|
Display a message when pinPads returns an error
|
2017-05-22 10:41:47 +02:00 |
|
ansuz
|
af4fd3c6d3
|
resolve merge conflicts
|
2017-05-19 19:14:08 +02:00 |
|
yflory
|
1ab6eb3c5d
|
Add a queue for multiple uploads in the file app
|
2017-05-19 18:41:34 +02:00 |
|
ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
2017-05-19 18:37:31 +02:00 |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-19 09:13:38 +02:00 |
|
ansuz
|
e7a458295b
|
new translation keys for file upload
|
2017-05-19 09:10:36 +02:00 |
|
yflory
|
814c81fb13
|
Display an alert when CryptPad has a new version
|
2017-05-18 18:51:08 +02:00 |
|
yflory
|
21f9e31e75
|
Add a placeholder for the user app
|
2017-05-18 15:56:35 +02:00 |
|
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
2017-05-18 15:05:37 +02:00 |
|
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
2017-05-18 14:54:02 +02:00 |
|
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 14:27:10 +02:00 |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
2017-05-18 14:26:56 +02:00 |
|
ansuz
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
2017-05-18 12:58:49 +02:00 |
|
ansuz
|
517438d7c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 14:33:34 +02:00 |
|
ansuz
|
81af9225fc
|
template a Romanian translation
|
2017-05-16 14:32:54 +02:00 |
|
ansuz
|
e8275c02c6
|
Merge pull request #115 from pbondoer/spanish
Spanish update
|
2017-05-16 14:23:06 +02:00 |
|
Pierre Bondoerffer
|
ad6217f064
|
file upload spanish keys
|
2017-05-16 14:05:36 +02:00 |
|
ansuz
|
827233dcba
|
new translation keys for file upload
|
2017-05-16 14:01:06 +02:00 |
|
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
2017-05-15 18:16:22 +02:00 |
|
yflory
|
716245f864
|
Make all the buttons look the same
|
2017-05-15 16:16:50 +02:00 |
|
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
2017-05-15 14:53:51 +02:00 |
|
yflory
|
48496416e7
|
Use the same font-size for all the toolbar buttons
|
2017-05-15 14:46:17 +02:00 |
|
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
2017-05-15 13:54:03 +02:00 |
|
Pierre Bondoerffer
|
ad5e18f558
|
Spanish update
|
2017-05-15 12:05:50 +02:00 |
|
yflory
|
601226115b
|
New anonymous drive
|
2017-05-12 18:06:29 +02:00 |
|
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
2017-05-11 10:58:33 +02:00 |
|
yflory
|
5a21be8112
|
Improve UI on mobile
|
2017-05-10 15:54:09 +02:00 |
|
yflory
|
ca6f910f0b
|
Add french translations for 'log out everywhere'
|
2017-05-09 10:32:41 +02:00 |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:57:05 +02:00 |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
2017-05-05 15:47:46 +02:00 |
|
ansuz
|
6909f663b6
|
modify 'log out everywhere' text
|
2017-05-05 15:18:32 +02:00 |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
2017-05-05 15:09:07 +02:00 |
|
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
2017-05-05 11:51:41 +02:00 |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
2017-05-05 09:10:31 +02:00 |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:16:16 +02:00 |
|
ansuz
|
78b11584f8
|
remove unused variables
|
2017-05-04 16:16:09 +02:00 |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:08:21 +02:00 |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
2017-05-04 16:08:12 +02:00 |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
2017-05-04 11:20:52 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
2017-04-28 18:23:41 +02:00 |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
2017-04-28 13:06:55 +02:00 |
|
yflory
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
2017-04-28 12:40:39 +02:00 |
|
yflory
|
ab1dc48b6d
|
Fix the 'limit reached' icon in the pad app
|
2017-04-28 12:32:49 +02:00 |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
2017-04-28 12:08:05 +02:00 |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
2017-04-27 18:46:46 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
e40203480f
|
Merge pull request #113 from pbondoer/staging
Update spanish
|
2017-04-24 16:09:53 +02:00 |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
2017-04-24 15:41:29 +02:00 |
|
Pierre Bondoerffer
|
ba407322e8
|
Update spanish
|
2017-04-24 15:16:30 +02:00 |
|
yflory
|
3e28d1b966
|
Add a missing key in the french translation
|
2017-04-24 14:41:55 +02:00 |
|
yflory
|
9abfadb32f
|
Update french translation
|
2017-04-24 14:39:30 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
df9c312b7d
|
make new text translateable
|
2017-04-18 18:31:58 +02:00 |
|
ansuz
|
8f352c8433
|
add justify plugin to default ckeditor config
|
2017-04-18 15:49:31 +02:00 |
|
Caleb James DeLisle
|
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 |
|
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
2017-04-14 19:34:58 +02:00 |
|
ansuz
|
50793f506d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-14 18:44:20 +02:00 |
|
yflory
|
43c045721c
|
Get the channel history
|
2017-04-14 18:36:36 +02:00 |
|
ansuz
|
eed5b1260d
|
set font-size label to match other ckeditor font sizes
|
2017-04-14 18:20:40 +02:00 |
|
Pierre Bondoerffer
|
0db603f580
|
spanish pinpad
|
2017-04-14 17:59:08 +02:00 |
|
ansuz
|
84dd879abb
|
add messages for settings page
|
2017-04-14 17:22:00 +02:00 |
|
ansuz
|
4c7022ade9
|
Merge pull request #109 from pbondoer/spanish
Espanol!
|
2017-04-13 18:10:35 +02:00 |
|
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 |
|