yflory
|
831c23b259
|
Merge branch 'staging' into oo
|
7 years ago |
|
yflory
|
5d584625e4
|
FAQ pages
|
7 years ago |
|
yflory
|
5c1e5a3f49
|
Merge branch 'staging' into oo
|
7 years ago |
|
yflory
|
299a2f4c08
|
FAQ placeholder
|
7 years ago |
|
yflory
|
70e014cdfc
|
Hide infinite spinner and disconnect modals when pad is deleted
|
7 years ago |
|
yflory
|
0b022af5db
|
Fix style issues in IE and mobiles
|
7 years ago |
|
yflory
|
ea7a3c75fa
|
Fix hidden content in the pad creation screen with smaller screen or zoom
|
7 years ago |
|
yflory
|
81ea3b14d7
|
Fix usage bar position in the settings app
|
7 years ago |
|
yflory
|
4df4c48fbd
|
Improve UI for pad creation screen
|
7 years ago |
|
ansuz
|
de838a3184
|
fix usage bar styles
|
7 years ago |
|
yflory
|
5089f1206d
|
Pad creation screen translations and link to settings
|
7 years ago |
|
yflory
|
462c229b17
|
Add links to features table
|
7 years ago |
|
yflory
|
5827905dbd
|
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
|
7 years ago |
|
yflory
|
166a9e71cf
|
Add a features comparison page
|
7 years ago |
|
yflory
|
2995782079
|
Different colors for ok and cancel in alertify
|
7 years ago |
|
ansuz
|
fc8847dae4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
04b862352f
|
update style for usage bar
|
7 years ago |
|
yflory
|
c5ebbe1a56
|
New share menu
|
7 years ago |
|
yflory
|
dffa117f4d
|
lint compliance
|
7 years ago |
|
yflory
|
daef08a9b3
|
Add an advanced new pad modal
|
7 years ago |
|
yflory
|
c460e2820e
|
Fix a 1px offset for the userlist in Firefox/Windows
|
7 years ago |
|
yflory
|
ef480fea79
|
Add a settings category for the pad creation screen
|
7 years ago |
|
yflory
|
73126ed597
|
Display the owner and expiration time of a pad in the properties modal
|
7 years ago |
|
yflory
|
65ccfe39ef
|
Add a 'properties' button in pads to display pad data
|
7 years ago |
|
yflory
|
fa6106a6bb
|
Use CSS to remove the loading screen
|
7 years ago |
|
yflory
|
b06b2dbafc
|
less lint compliance
|
7 years ago |
|
yflory
|
34315b4500
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
c269929319
|
Fix creation page not displayed in pad and slide
|
7 years ago |
|
ansuz
|
16388a839c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
230f9524be
|
new less linter rules and compliance
|
7 years ago |
|
yflory
|
4e46d0daa5
|
Fix the 'New' button icon in the toolbar
|
7 years ago |
|
yflory
|
dcfccf88cd
|
Merge branch 'creationpage' into staging
|
7 years ago |
|
yflory
|
1922dbfd75
|
Creation page with mobile support
|
7 years ago |
|
Caleb James DeLisle
|
024aa741a7
|
Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant
|
7 years ago |
|
Caleb James DeLisle
|
1d2119b292
|
Removed LESS duplicate attributes
|
7 years ago |
|
Caleb James DeLisle
|
bfba239770
|
Fixed missing semicolons in less
|
7 years ago |
|
Caleb James DeLisle
|
9af941741d
|
Fix trailing whitespace and empty selectors in less
|
7 years ago |
|
Caleb James DeLisle
|
dd44b4da99
|
Removed old /less/ directory which is nolonger used :)
|
7 years ago |
|
Caleb James DeLisle
|
12b0f3e201
|
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
|
7 years ago |
|
Caleb James DeLisle
|
617c4b6044
|
CSS refactorings and pad-is-not-pinned work
|
7 years ago |
|
yflory
|
e96d54e655
|
Add a pad creation page
|
7 years ago |
|
Caleb James DeLisle
|
67f8031beb
|
Wrong usage of colortheme.less, fixed
|
7 years ago |
|
yflory
|
64303b4090
|
Merge branch 'refactor' into staging
|
7 years ago |
|
Caleb James DeLisle
|
ba74f9d37a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
1dabea84d9
|
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
|
7 years ago |
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
7 years ago |
|
yflory
|
e164edec03
|
Fix the webworker app
|
7 years ago |
|
ansuz
|
bcdc0d810a
|
make 404 page translateable, point to home page or drive
|
7 years ago |
|
ansuz
|
443eeaa407
|
fancy 404 page
|
7 years ago |
|
yflory
|
acd8ab7446
|
Add the markdown toolbar in profile
|
7 years ago |
|
yflory
|
74e59a513a
|
Add the markdown toolbar to the slide and poll apps
|
7 years ago |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
7 years ago |
|
yflory
|
cdd8c6e110
|
Fix history mode not centered
|
7 years ago |
|
yflory
|
06011065d2
|
Add a debug app
|
7 years ago |
|
yflory
|
cf26c4c286
|
Improve the toolbar UI for smaller screens
|
7 years ago |
|
yflory
|
1f53304ad3
|
Display a dropdown menu inside another one
|
7 years ago |
|
yflory
|
014e12b5b5
|
Ability to update the username from the userlist
|
7 years ago |
|
yflory
|
101482b8cc
|
Migrate settings to use a sandboxed iframe
|
7 years ago |
|
yflory
|
e0f7df80b3
|
Fix avatar upload and use less2 everywhere in profile
|
7 years ago |
|
yflory
|
7f9b21405b
|
Add missing files for profile
|
7 years ago |
|
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 |
|
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 |
|
Caleb James DeLisle
|
753e2d797e
|
Merge branch 'staging' into framework
|
7 years ago |
|
ansuz
|
128c9c2f4e
|
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
|
7 years ago |
|
CatalinScr
|
21f1a48380
|
changed the login in button
|
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 |
|
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 |
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
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 |
|
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
|
53b98c12c9
|
ignore broken stylesheet
|
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
|
732585ea7b
|
Sandboxed iframe for the whiteboard app
|
7 years ago |
|
ansuz
|
f9d27d2783
|
WIP secure contacts
|
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
|
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 |
|
ansuz
|
244e3ecba7
|
support forefront flag in alert config
|
7 years ago |
|
yflory
|
437f50fd4a
|
Migrate the file to a sandboxed iframe
|
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
|
f2aaaa9751
|
Move slide to secure iframe
|
7 years ago |
|
ansuz
|
809b56625d
|
refactor ui elements
|
7 years ago |
|
ansuz
|
ef30b0bc42
|
contribute to z-index arms race
|
7 years ago |
|
ansuz
|
263c2eb2c2
|
fix overflowing title text
|
7 years ago |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
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 |
|
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
|
f95f3f4f24
|
Updated the contact page
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
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 |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
7 years ago |
|
Caleb James DeLisle
|
35e7341f4d
|
Merge branch 'ui-integration' into staging2
|
7 years ago |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
7 years ago |
|
yflory
|
1752124071
|
Fix Iframe height in Edge
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
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
|
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
|
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
|
144f9f4c83
|
alertify fix on mobile
|
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 |
|
Pierre Bondoerffer
|
04b84538e1
|
add Open Sans font (with bower)
|
7 years ago |
|
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
7 years ago |
|
Pierre Bondoerffer
|
280c10c57d
|
alertify: use the right box-shadow
|
7 years ago |
|
Pierre Bondoerffer
|
ec011b15d5
|
remove duplicate css property
|
7 years ago |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
7 years ago |
|
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
7 years ago |
|
Pierre Bondoerffer
|
88be5444f0
|
change alertify warn color
|
7 years ago |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
7 years ago |
|
Pierre Bondoerffer
|
008fa12755
|
alertify: add textarea + checkbox
|
7 years ago |
|
Pierre Bondoerffer
|
e486e47aa1
|
alertify: fix input color + better log styles
|
7 years ago |
|
Pierre Bondoerffer
|
e333e7903d
|
fix styles overlapping
|
7 years ago |
|
Pierre Bondoerffer
|
1db41dd17b
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
dac14de18c
|
unify fonts
|
7 years ago |
|
CatalinScr
|
5afadf10aa
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
CatalinScr
|
3f6b234e97
|
Styled the general menu, footer, updated about
|
7 years ago |
|
Pierre Bondoerffer
|
d3fb6313b6
|
color logo on topbar
|
7 years ago |
|
Pierre Bondoerffer
|
865ba0731c
|
better colors? not sure yet...
|
7 years ago |
|
Pierre Bondoerffer
|
1bd42f0b3e
|
make alertify darker
|
7 years ago |
|
Pierre Bondoerffer
|
ecc766eb7b
|
remove useless margin
|
7 years ago |
|
Pierre Bondoerffer
|
addd91cc72
|
fix styles (again) copyright cjd 2017
|
7 years ago |
|
Pierre Bondoerffer
|
5c21a9048e
|
fix styles
|
7 years ago |
|
Pierre Bondoerffer
|
10e50fc5c7
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
6614f3f0e6
|
put the page class on html element
|
7 years ago |
|
CatalinScr
|
043ae4280b
|
repaired the menu
|
7 years ago |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
7 years ago |
|
Pierre Bondoerffer
|
4018c7e0a6
|
move alertify stuff
|
7 years ago |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
7 years ago |
|
CatalinScr
|
e7d09c1ddb
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
|
7 years ago |
|
CatalinScr
|
d4ce7d626c
|
Modified the menu
|
7 years ago |
|
Pierre Bondoerffer
|
f8c7140eec
|
make fonts big
|
7 years ago |
|
Pierre Bondoerffer
|
f6d45d05f6
|
use logo in toolbar
|
7 years ago |
|
Caleb James DeLisle
|
5d70dd93b3
|
Manual merge
|
7 years ago |
|
CatalinScr
|
15fa801bc8
|
work in progress
|
7 years ago |
|
CatalinScr
|
89ab82c0e2
|
Changed the menu, added the logo on top bar
|
7 years ago |
|
Pierre Bondoerffer
|
ae176b0465
|
about page mockup
|
7 years ago |
|
Pierre Bondoerffer
|
86bc14e6bb
|
new loading screen
|
7 years ago |
|
Pierre Bondoerffer
|
304a29e210
|
Improve contact page
|
7 years ago |
|
Pierre Bondoerffer
|
d6679e8ef3
|
Add screenshots to What is CryptPad
|
7 years ago |
|
Pierre Bondoerffer
|
e2f8c9c5da
|
add logo to topbar
|
7 years ago |
|
Pierre Bondoerffer
|
cd0c9cc95a
|
create less templates for info pages
|
7 years ago |
|
Pierre Bondoerffer
|
f71b082aac
|
remove min-height globally, style footer
|
7 years ago |
|
Pierre Bondoerffer
|
0fe49d6641
|
oops, sorry, back to 100% height
|
7 years ago |
|
Pierre Bondoerffer
|
dc0a037894
|
turn login and register into infopages
|
7 years ago |
|
Pierre Bondoerffer
|
549b1b2c4f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
775ea81504
|
start register page
|
7 years ago |
|
CatalinScr
|
69c470330f
|
updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
|
7 years ago |
|
CatalinScr
|
e609950977
|
Changed the favicon, added the boostrap js file, reconfigure the top menu
|
7 years ago |
|
Caleb James DeLisle
|
27aa1886b1
|
Move footer to pages.js and add it to the contact page
|
7 years ago |
|
Caleb James DeLisle
|
490e2b4d0a
|
work in progress on migrating styles back into the infopages.less
|
7 years ago |
|
Caleb James DeLisle
|
cd2b41f51e
|
Fix up some less for supporting the info-pages
|
7 years ago |
|
Caleb James DeLisle
|
896186d059
|
Fix some wrong less files which were breaking the UI of the apps
|
7 years ago |
|
ansuz
|
4614d6ae81
|
remove legacy max-width from usage bar
|
7 years ago |
|
CatalinScr
|
87dec4a091
|
Changed the font size
|
7 years ago |
|
CatalinScr
|
5921073524
|
Updated the new font, changed the logo, changed see more
|
7 years ago |
|
CatalinScr
|
6862bda454
|
Changed the logo, uploaded the new font, repaired responsive
|
7 years ago |
|
Caleb James DeLisle
|
428bee6306
|
make links clickable and make more link work
|
7 years ago |
|
yflory
|
3da76e3ae8
|
Update style for the todo app
|
7 years ago |
|
CatalinScr
|
5fa20836cf
|
Modified Register and login button
|
7 years ago |
|
CatalinScr
|
cab8716519
|
Changed the login button, repaired the hover menu and see more. Updated the logo
|
7 years ago |