yflory
|
4250688856
|
Migrate profile to use sframe
|
7 years ago |
|
yflory
|
abc511a56e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
68accaf653
|
Todo in sframe with less2
|
7 years ago |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
7 years ago |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
7 years ago |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
7 years ago |
|
ansuz
|
69f9a7ebf3
|
make userlist change notifications configurable
|
7 years ago |
|
yflory
|
204f3e1441
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
74985fd0f2
|
Use text for the addUser button in polls
|
7 years ago |
|
ansuz
|
7d1892546b
|
add missing french translation
|
7 years ago |
|
ansuz
|
2e5fdf709a
|
Merge branch 'soon' into staging
|
7 years ago |
|
ansuz
|
aaef30f489
|
bump cryptpad version
|
7 years ago |
|
yflory
|
ce5d24a1d3
|
Remove error message about Tether
|
7 years ago |
|
ansuz
|
d571f408d8
|
Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
|
7 years ago |
|
yflory
|
3e4faf1be1
|
Add new state messages in the toolbar
|
7 years ago |
|
Yannick A
|
63dcfd6d18
|
Update French translation
|
7 years ago |
|
Caleb James DeLisle
|
a149152f11
|
Merge branch 'staging' into framework
|
7 years ago |
|
yflory
|
e553351b79
|
Put the add friend button in the userlist below the name
|
7 years ago |
|
yflory
|
6920129126
|
Embed images from the drive in whiteboard
|
7 years ago |
|
MacLemon
|
867b971c33
|
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
|
7 years ago |
|
yflory
|
2fd120100a
|
Merge branch 'wb' into staging
|
7 years ago |
|
Caleb James DeLisle
|
15337603bb
|
Merge branch 'staging' into framework
|
7 years ago |
|
Caleb James DeLisle
|
753e2d797e
|
Merge branch 'staging' into framework
|
7 years ago |
|
yflory
|
62bc72847f
|
Add an error message when trying to tag a deleted pad
|
7 years ago |
|
yflory
|
50090a3af6
|
Add placeholders for the comment form in poll
|
7 years ago |
|
yflory
|
ecb537ac7f
|
Move code to render.js in poll
|
7 years ago |
|
yflory
|
c985aa60aa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
f4189f883e
|
Add missing french translation keys
|
7 years ago |
|
ansuz
|
128c9c2f4e
|
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
|
7 years ago |
|
ansuz
|
d046b9ce33
|
add missing French key
|
7 years ago |
|
ansuz
|
f0bdc3b26f
|
second try
|
7 years ago |
|
ansuz
|
d50a692986
|
add note about tags to prompt
|
7 years ago |
|
CatalinScr
|
21f1a48380
|
changed the login in button
|
7 years ago |
|
yflory
|
d3d6940b69
|
Update french translation for tags
|
7 years ago |
|
ansuz
|
3f181fa370
|
update loading screen tip for tags
|
7 years ago |
|
ansuz
|
f751554f82
|
update footer and package.json for upcoming version
|
7 years ago |
|
yflory
|
dd141b5c9f
|
Disable comments when a poll is not published
|
7 years ago |
|
yflory
|
5e7bf0cfb8
|
Embed an image in whiteboard
|
7 years ago |
|
Caleb James DeLisle
|
f0eb58ee95
|
Merge branch 'staging' into framework
|
7 years ago |
|
yflory
|
ab3648a30a
|
Merge branch 'newpoll' into staging
|
7 years ago |
|
yflory
|
1c4f1c785d
|
Improve stability and UI in poll and its comments
|
7 years ago |
|
ansuz
|
080511efcd
|
add missing translation for hashtags
|
7 years ago |
|
Caleb James DeLisle
|
d9e97b86e6
|
Merge branch 'staging' into framework
|
7 years ago |
|
Caleb James DeLisle
|
383c2f54cb
|
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
|
7 years ago |
|
yflory
|
26dfc65c25
|
Comments in polls
|
7 years ago |
|
yflory
|
846b1a9fb3
|
Improve description UI in poll. Enable tags and mediatag
|
7 years ago |
|
yflory
|
68bda92291
|
Use codemirror for description in poll
|
7 years ago |
|
ansuz
|
e2f53eaddb
|
add loading screen tip about hashtags
|
7 years ago |
|
ansuz
|
b8ce149db6
|
add hint about tag usage
|
7 years ago |
|
yflory
|
5cf86bf74a
|
Update UI in poll and remove old code
|
7 years ago |
|
Caleb James DeLisle
|
94d2f4472b
|
Stop using presentSuccess because it is hidden behind the modal in slide
|
7 years ago |
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
7 years ago |
|
Caleb James DeLisle
|
fa6938baa8
|
1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
|
7 years ago |
|
yflory
|
66da349ee4
|
Sandboxed Poll app with less2
|
7 years ago |
|
yflory
|
e02a779c14
|
Use secure drive as default drive
|
7 years ago |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
7 years ago |
|
yflory
|
767027b237
|
Lint
|
7 years ago |
|
yflory
|
0df9e5ace0
|
Fix toolbar in polls
|
7 years ago |
|
ansuz
|
b3e066eaca
|
show loading screen tips during loading screen
|
7 years ago |
|
yflory
|
cdeac00633
|
Merge branch 'staging' into newdrive
|
7 years ago |
|
yflory
|
1d7683503f
|
Fix link origin in sframe upload table
|
7 years ago |
|
yflory
|
92c808812a
|
Fix missing style in toolbar/less2
|
7 years ago |
|
yflory
|
c364377d7c
|
Use less2 in sframe drive
|
7 years ago |
|
yflory
|
dfdeb7b113
|
Fix style and race condition for history mode
|
7 years ago |
|
yflory
|
a810d7bd85
|
Fix style and race condition for history mode
|
7 years ago |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
7 years ago |
|
ansuz
|
95302366d1
|
lint compliance
|
7 years ago |
|
ansuz
|
53b98c12c9
|
ignore broken stylesheet
|
7 years ago |
|
yflory
|
95542bcdaf
|
Lint
|
7 years ago |
|
yflory
|
88914ec6cc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
8a09e39f46
|
Enable tags in pads
|
7 years ago |
|
ansuz
|
d2b27f3588
|
resolve merge conflicts
|
7 years ago |
|
ansuz
|
f127240a2f
|
add poll to main.less
|
7 years ago |
|
yflory
|
6683434c62
|
Fix wrong relative url
|
7 years ago |
|
yflory
|
35a313d6ee
|
Make palette realtime
|
7 years ago |
|
yflory
|
3023e8c855
|
Fix templates in whiteboard
|
7 years ago |
|
yflory
|
732585ea7b
|
Sandboxed iframe for the whiteboard app
|
7 years ago |
|
ansuz
|
f9d27d2783
|
WIP secure contacts
|
7 years ago |
|
yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
7 years ago |
|
yflory
|
c00d295466
|
Add missing translations
|
7 years ago |
|
yflory
|
974658453c
|
Mediatag integration in pads
|
7 years ago |
|
Caleb James DeLisle
|
b24e9b84af
|
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
|
7 years ago |
|
ansuz
|
2797a77f5d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
e0ae0fcd91
|
thanks Dima!
|
7 years ago |
|
ansuz
|
f039fc7ff5
|
develop a system for avoiding z-index problems
|
7 years ago |
|
yflory
|
d360e2d0f4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
ab64bf9e59
|
Use less2 for the loading screen
|
7 years ago |
|
Caleb James DeLisle
|
0d8c292fef
|
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
789a923792
|
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
|
7 years ago |
|
ansuz
|
244e3ecba7
|
support forefront flag in alert config
|
7 years ago |
|
yflory
|
8c41e0bdd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
437f50fd4a
|
Migrate the file to a sandboxed iframe
|
7 years ago |
|
ansuz
|
ad591fba50
|
bump version
|
7 years ago |
|
yflory
|
8c3e2dbe61
|
Missing french translation keys
|
7 years ago |
|
ansuz
|
306fec2d0e
|
improve messages for template picker confirm
|
7 years ago |
|
yflory
|
37dca9c155
|
Add missing translation keys in french
|
7 years ago |
|
ansuz
|
134c6057c1
|
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
|
7 years ago |
|
ansuz
|
59d25b4c1a
|
use camel case, not snek case
|
7 years ago |
|
yflory
|
5cde3fffb8
|
Align title for normal, readonly and page mode in the toolbar
|
7 years ago |
|
yflory
|
7582c9cffd
|
Fix register button in the index dropdown menu for mobiles
|
7 years ago |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
7 years ago |
|
yflory
|
fc069dac48
|
Ask the user before loading the template picker
|
7 years ago |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
7 years ago |
|
ansuz
|
809b56625d
|
refactor ui elements
|
7 years ago |
|
ansuz
|
bca9ba66cb
|
enforce a configurable minimum password length when registering
|
7 years ago |
|
ansuz
|
ef30b0bc42
|
contribute to z-index arms race
|
7 years ago |
|
ansuz
|
a6eb1444df
|
add loading screen markup to register and login
|
7 years ago |
|
ansuz
|
352d504944
|
avoid loading unnecessary files
|
7 years ago |
|
ansuz
|
263c2eb2c2
|
fix overflowing title text
|
7 years ago |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
7 years ago |
|
yflory
|
fe8b2c2556
|
Fix french translation
|
7 years ago |
|
yflory
|
8f2776657b
|
Add translations for pad embed
|
7 years ago |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
7 years ago |
|
yflory
|
d22edc03b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
7 years ago |
|
ansuz
|
5c9ce0caa5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
77bbb3add4
|
bump footer and package.json version string
|
7 years ago |
|
yflory
|
01881ac469
|
Update loading tips in the french translation
|
7 years ago |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
7 years ago |
|
ansuz
|
5eb13461c0
|
remove anchor button
|
7 years ago |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
7 years ago |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
7 years ago |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
7 years ago |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
7 years ago |
|
ansuz
|
7b27b8635d
|
fix padding on registration button
|
7 years ago |
|
ansuz
|
6bb29e52e2
|
lint compliance
|
7 years ago |
|
CatalinScr
|
0ceb4cbbcb
|
Updated the contact page with the new design
|
7 years ago |
|
CatalinScr
|
83be769bb3
|
Merge branch 'master' into staging
updated with new version
|
7 years ago |
|
CatalinScr
|
1bf77cb77e
|
changed the icons
|
7 years ago |
|
CatalinScr
|
ee325c1813
|
Repaired the errors from lint
|
7 years ago |
|
CatalinScr
|
f95f3f4f24
|
Updated the contact page
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
7 years ago |
|
yflory
|
d3e947f17e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
7498057c89
|
Fix Safari iframe size
|
7 years ago |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
7 years ago |
|
ansuz
|
a34d1793e0
|
drop 'loading' text from loading screen
|
7 years ago |
|
ansuz
|
2ef4ebc6ef
|
two new tips for the loading screen
|
7 years ago |
|
ansuz
|
570ff75a6c
|
update footer for latest version
|
7 years ago |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
7 years ago |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
7 years ago |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
7 years ago |
|
ansuz
|
f9cdbe66a0
|
add forgotten translation string
|
7 years ago |
|
Caleb James DeLisle
|
35e7341f4d
|
Merge branch 'ui-integration' into staging2
|
7 years ago |
|
Caleb James DeLisle
|
7bbea28831
|
minor anti-xss changes...
|
7 years ago |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
7 years ago |
|
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
7 years ago |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
7 years ago |
|
yflory
|
1752124071
|
Fix Iframe height in Edge
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
7 years ago |
|
CatalinScr
|
49f7e0d63b
|
Changed the Social Media links to Pierre
|
7 years ago |
|
ansuz
|
48fe3ef841
|
add a tip about cryptdrive
|
7 years ago |
|
ansuz
|
839c6df3bb
|
remove invalid loading screen tips. create a new one
|
7 years ago |
|
yflory
|
0a813b4fab
|
Fix limit bar overflowing when over the limit
|
7 years ago |
|
CatalinScr
|
744fb407ae
|
Updated the what is page
|
7 years ago |
|
ansuz
|
46e47b454d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
f7b2aa85b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
3df20760c4
|
Yann does not have a twitter account.
|
7 years ago |
|
yflory
|
df8851a53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
df0b7155f6
|
Add missing french translation
|
7 years ago |
|
ansuz
|
127b6dbc6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
8b5519ad29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
2b7dcbe77c
|
remove bs class that caused poor alignment sometimes
|
7 years ago |
|
Caleb James DeLisle
|
4213d6de70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
d6125d864c
|
Added Yann's bio
|
7 years ago |
|
yflory
|
a39f802b4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
e4d842ed08
|
Fix typos in the french translation
|
7 years ago |
|
ansuz
|
7537caf8fe
|
make footer translateable
|
7 years ago |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
7 years ago |
|
CatalinScr
|
fd3fd945c8
|
Updated the Log in Page
|
7 years ago |
|
CatalinScr
|
1f4d0a0a56
|
Repaired a bug
|
7 years ago |
|
CatalinScr
|
dd48cf7c90
|
updated the register page
|
7 years ago |
|
CatalinScr
|
3196d4558f
|
repaired the responsive error at about page
|
7 years ago |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
7 years ago |
|
Caleb James DeLisle
|
7c8df61f91
|
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
|
7 years ago |
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
7 years ago |
|
Pierre Bondoerffer
|
f580d9a30a
|
*actually* fix alertify on mobile
|
7 years ago |
|
Pierre Bondoerffer
|
8c0fe7d277
|
Add missing UI element translations
|
7 years ago |
|
Pierre Bondoerffer
|
144f9f4c83
|
alertify fix on mobile
|
7 years ago |
|
Caleb James DeLisle
|
9833bd7e59
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
89a8e8050c
|
Fix typo and also change message to explain itself better
|
7 years ago |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
328107be4d
|
translation key for using tabs
|
7 years ago |
|
Pierre Bondoerffer
|
b00d37d9e7
|
proper namespace for font
|
7 years ago |
|
Pierre Bondoerffer
|
0f74dffc48
|
fix register button being cut off
|
7 years ago |
|
Pierre Bondoerffer
|
92d3b1a9fc
|
actually pull in open-sans, move fonts to own include
|
7 years ago |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
7 years ago |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
7 years ago |
|
ansuz
|
7f2b7fc287
|
show Your CryptDrive, if logged in. fix typos
|
7 years ago |
|
Pierre Bondoerffer
|
ef256e3849
|
go to homepage when on infopages
|
7 years ago |
|
Pierre Bondoerffer
|
04b84538e1
|
add Open Sans font (with bower)
|
7 years ago |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
7 years ago |
|
Caleb James DeLisle
|
1043e076a4
|
Merge branch 'ui-integration' into staging
|
7 years ago |
|
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
7 years ago |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
7 years ago |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
7 years ago |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
7 years ago |