yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
2017-09-18 14:26:54 +02:00 |
|
yflory
|
c00d295466
|
Add missing translations
|
2017-09-15 17:33:36 +02:00 |
|
yflory
|
974658453c
|
Mediatag integration in pads
|
2017-09-15 13:21:37 +02:00 |
|
Caleb James DeLisle
|
b24e9b84af
|
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
|
2017-09-14 10:48:35 +02:00 |
|
ansuz
|
2797a77f5d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-13 18:18:45 +02:00 |
|
ansuz
|
e0ae0fcd91
|
thanks Dima!
|
2017-09-13 17:47:49 +02:00 |
|
ansuz
|
f039fc7ff5
|
develop a system for avoiding z-index problems
|
2017-09-13 17:43:17 +02:00 |
|
yflory
|
d360e2d0f4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-13 16:20:26 +02:00 |
|
yflory
|
ab64bf9e59
|
Use less2 for the loading screen
|
2017-09-13 16:19:26 +02:00 |
|
Caleb James DeLisle
|
0d8c292fef
|
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-13 14:47:55 +02:00 |
|
Caleb James DeLisle
|
789a923792
|
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
|
2017-09-13 14:47:50 +02:00 |
|
ansuz
|
244e3ecba7
|
support forefront flag in alert config
|
2017-09-13 12:32:30 +02:00 |
|
yflory
|
8c41e0bdd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-12 18:40:20 +02:00 |
|
yflory
|
437f50fd4a
|
Migrate the file to a sandboxed iframe
|
2017-09-12 18:40:11 +02:00 |
|
ansuz
|
ad591fba50
|
bump version
|
2017-09-12 14:04:30 +02:00 |
|
yflory
|
8c3e2dbe61
|
Missing french translation keys
|
2017-09-12 11:45:47 +02:00 |
|
ansuz
|
306fec2d0e
|
improve messages for template picker confirm
|
2017-09-11 16:25:58 +02:00 |
|
yflory
|
37dca9c155
|
Add missing translation keys in french
|
2017-09-11 14:12:06 +02:00 |
|
ansuz
|
134c6057c1
|
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
|
2017-09-11 14:01:05 +02:00 |
|
ansuz
|
59d25b4c1a
|
use camel case, not snek case
|
2017-09-11 14:00:27 +02:00 |
|
yflory
|
5cde3fffb8
|
Align title for normal, readonly and page mode in the toolbar
|
2017-09-11 12:04:22 +02:00 |
|
yflory
|
7582c9cffd
|
Fix register button in the index dropdown menu for mobiles
|
2017-09-11 11:22:41 +02:00 |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
2017-09-08 16:23:07 +02:00 |
|
yflory
|
fc069dac48
|
Ask the user before loading the template picker
|
2017-09-08 16:21:12 +02:00 |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
2017-09-07 18:56:58 +02:00 |
|
ansuz
|
809b56625d
|
refactor ui elements
|
2017-09-07 18:54:58 +02:00 |
|
ansuz
|
bca9ba66cb
|
enforce a configurable minimum password length when registering
|
2017-09-07 17:44:04 +02:00 |
|
ansuz
|
ef30b0bc42
|
contribute to z-index arms race
|
2017-09-07 16:50:06 +02:00 |
|
ansuz
|
a6eb1444df
|
add loading screen markup to register and login
|
2017-09-07 16:39:42 +02:00 |
|
ansuz
|
352d504944
|
avoid loading unnecessary files
|
2017-09-07 16:39:20 +02:00 |
|
ansuz
|
263c2eb2c2
|
fix overflowing title text
|
2017-09-07 14:17:43 +02:00 |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-07 12:45:18 +02:00 |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
2017-09-07 12:45:07 +02:00 |
|
yflory
|
fe8b2c2556
|
Fix french translation
|
2017-09-06 15:43:30 +02:00 |
|
yflory
|
8f2776657b
|
Add translations for pad embed
|
2017-09-06 11:21:53 +02:00 |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
2017-09-06 10:56:27 +02:00 |
|
yflory
|
d22edc03b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:34:49 +02:00 |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
2017-09-05 15:34:38 +02:00 |
|
ansuz
|
5c9ce0caa5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:32:31 +02:00 |
|
ansuz
|
77bbb3add4
|
bump footer and package.json version string
|
2017-09-05 15:29:28 +02:00 |
|
yflory
|
01881ac469
|
Update loading tips in the french translation
|
2017-09-05 15:15:57 +02:00 |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
2017-09-05 15:08:05 +02:00 |
|
ansuz
|
5eb13461c0
|
remove anchor button
|
2017-09-05 12:16:49 +02:00 |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
2017-09-05 11:57:44 +02:00 |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
2017-09-05 11:38:17 +02:00 |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
2017-09-05 11:36:02 +02:00 |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
2017-09-04 15:09:54 +02:00 |
|
ansuz
|
7b27b8635d
|
fix padding on registration button
|
2017-08-31 18:58:08 +02:00 |
|
ansuz
|
6bb29e52e2
|
lint compliance
|
2017-08-31 18:45:18 +02:00 |
|
CatalinScr
|
0ceb4cbbcb
|
Updated the contact page with the new design
|
2017-08-31 16:26:20 +03:00 |