Commit Graph

680 Commits (c418f77e489d65fc3888b453277c230f1f48bab5)

Author SHA1 Message Date
yflory 5089f1206d Pad creation screen translations and link to settings
yflory 462c229b17 Add links to features table
yflory 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it
yflory 166a9e71cf Add a features comparison page
yflory 2995782079 Different colors for ok and cancel in alertify
ansuz fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 04b862352f update style for usage bar
yflory c5ebbe1a56 New share menu
yflory dffa117f4d lint compliance
yflory daef08a9b3 Add an advanced new pad modal
yflory c460e2820e Fix a 1px offset for the userlist in Firefox/Windows
yflory ef480fea79 Add a settings category for the pad creation screen
yflory 73126ed597 Display the owner and expiration time of a pad in the properties modal
yflory 65ccfe39ef Add a 'properties' button in pads to display pad data
yflory fa6106a6bb Use CSS to remove the loading screen
yflory b06b2dbafc less lint compliance
yflory 34315b4500 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory c269929319 Fix creation page not displayed in pad and slide
ansuz 16388a839c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 230f9524be new less linter rules and compliance
yflory 4e46d0daa5 Fix the 'New' button icon in the toolbar
yflory dcfccf88cd Merge branch 'creationpage' into staging
yflory 1922dbfd75 Creation page with mobile support
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
Caleb James DeLisle 1d2119b292 Removed LESS duplicate attributes
Caleb James DeLisle bfba239770 Fixed missing semicolons in less
Caleb James DeLisle 9af941741d Fix trailing whitespace and empty selectors in less
Caleb James DeLisle dd44b4da99 Removed old /less/ directory which is nolonger used :)
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
Caleb James DeLisle 617c4b6044 CSS refactorings and pad-is-not-pinned work
yflory e96d54e655 Add a pad creation page
Caleb James DeLisle 67f8031beb Wrong usage of colortheme.less, fixed
yflory 64303b4090 Merge branch 'refactor' into staging
Caleb James DeLisle ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic
yflory e164edec03 Fix the webworker app
ansuz bcdc0d810a make 404 page translateable, point to home page or drive
ansuz 443eeaa407 fancy 404 page
yflory acd8ab7446 Add the markdown toolbar in profile
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax
yflory cdd8c6e110 Fix history mode not centered
yflory 06011065d2 Add a debug app
yflory cf26c4c286 Improve the toolbar UI for smaller screens
yflory 1f53304ad3 Display a dropdown menu inside another one
yflory 014e12b5b5 Ability to update the username from the userlist
yflory 101482b8cc Migrate settings to use a sandboxed iframe
yflory e0f7df80b3 Fix avatar upload and use less2 everywhere in profile
yflory 7f9b21405b Add missing files for profile
yflory 4250688856 Migrate profile to use sframe
yflory abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 68accaf653 Todo in sframe with less2
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming
yflory 6f020b67ca Add thumbnails to framework apps
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework
yflory e553351b79 Put the add friend button in the userlist below the name
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
CatalinScr 21f1a48380 changed the login in button
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework
yflory ab3648a30a Merge branch 'newpoll' into staging
Caleb James DeLisle d9e97b86e6 Merge branch 'staging' into framework
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.
ansuz 351b95d6a9 resolve merge conflicts
yflory 66da349ee4 Sandboxed Poll app with less2
yflory e02a779c14 Use secure drive as default drive
yflory b4de31c827 Merge branch 'newdrive' into staging
ansuz b3e066eaca show loading screen tips during loading screen
yflory cdeac00633 Merge branch 'staging' into newdrive
yflory 1d7683503f Fix link origin in sframe upload table
yflory 92c808812a Fix missing style in toolbar/less2
yflory c364377d7c Use less2 in sframe drive
yflory dfdeb7b113 Fix style and race condition for history mode
yflory a810d7bd85 Fix style and race condition for history mode
yflory 456370b1aa Base for Drive in sandboxed iframe
ansuz 53b98c12c9 ignore broken stylesheet
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 8a09e39f46 Enable tags in pads
ansuz d2b27f3588 resolve merge conflicts
ansuz f127240a2f add poll to main.less
yflory 6683434c62 Fix wrong relative url
yflory 732585ea7b Sandboxed iframe for the whiteboard app
ansuz f9d27d2783 WIP secure contacts
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing.
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz f039fc7ff5 develop a system for avoiding z-index problems
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory ab64bf9e59 Use less2 for the loading screen
ansuz 244e3ecba7 support forefront flag in alert config
yflory 437f50fd4a Migrate the file to a sandboxed iframe
yflory 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar
yflory 7582c9cffd Fix register button in the index dropdown menu for mobiles
yflory c3a07e879c Merge branch 'staging' into slide2
yflory f2aaaa9751 Move slide to secure iframe
ansuz 809b56625d refactor ui elements
ansuz ef30b0bc42 contribute to z-index arms race
ansuz 263c2eb2c2 fix overflowing title text
ansuz 15e24ebe4f ui for hashtag picker
yflory 204e45dfae Enable templates in pad
yflory 78b338c379 Merge branch 'code2' into staging
yflory d2787e3eff Make code2 the default code app
yflory 86e23ac19f Use less2 in secure iframes
ansuz 7b27b8635d fix padding on registration button
CatalinScr 0ceb4cbbcb Updated the contact page with the new design
CatalinScr 83be769bb3 Merge branch 'master' into staging
updated with new version
CatalinScr 1bf77cb77e changed the icons
CatalinScr f95f3f4f24 Updated the contact page
yflory 0893bcc0e5 Merge branch 'staging' into code2
yflory 7498057c89 Fix Safari iframe size
yflory a2ed266048 Move the code app in a secure iframe
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js
yflory 1752124071 Fix Iframe height in Edge
Caleb James DeLisle b081603455 Update requirejs
yflory 0a813b4fab Fix limit bar overflowing when over the limit
CatalinScr 744fb407ae Updated the what is page
ansuz 8ee5e14a60 merge ui-integration
CatalinScr fd3fd945c8 Updated the Log in Page
CatalinScr 1f4d0a0a56 Repaired a bug
CatalinScr dd48cf7c90 updated the register page
CatalinScr 3196d4558f repaired the responsive error at about page
CatalinScr 3960cd25f8 Updated the about page with the new design
Caleb James DeLisle 196ce3b3f7 Fix alertify style which made the registration popup look bad
Pierre Bondoerffer f580d9a30a
*actually* fix alertify on mobile
Pierre Bondoerffer 144f9f4c83
alertify fix on mobile
Pierre Bondoerffer b00d37d9e7
proper namespace for font
Pierre Bondoerffer 0f74dffc48
fix register button being cut off
Pierre Bondoerffer 92d3b1a9fc
actually pull in open-sans, move fonts to own include
Pierre Bondoerffer 04b84538e1
add Open Sans font (with bower)
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow
Pierre Bondoerffer ec011b15d5
remove duplicate css property
Pierre Bondoerffer 34ba673cd3
improve file upload UI
Pierre Bondoerffer 90075cd48e
media-tag to less file
Pierre Bondoerffer 88be5444f0
change alertify warn color
Pierre Bondoerffer c53e738054
improve file picker ui
Pierre Bondoerffer 008fa12755
alertify: add textarea + checkbox
Pierre Bondoerffer e486e47aa1
alertify: fix input color + better log styles
Pierre Bondoerffer e333e7903d
fix styles overlapping
Pierre Bondoerffer 1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer dac14de18c
unify fonts
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about
Pierre Bondoerffer d3fb6313b6
color logo on topbar
Pierre Bondoerffer 865ba0731c
better colors? not sure yet...
Pierre Bondoerffer 1bd42f0b3e
make alertify darker
Pierre Bondoerffer ecc766eb7b
remove useless margin
Pierre Bondoerffer addd91cc72
fix styles (again) copyright cjd 2017
Pierre Bondoerffer 5c21a9048e
fix styles
Pierre Bondoerffer 10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 6614f3f0e6
put the page class on html element
CatalinScr 043ae4280b repaired the menu
CatalinScr 250d85bb8a Repaired the menu, clead the code
Pierre Bondoerffer 4018c7e0a6
move alertify stuff
Caleb James DeLisle 0d1f19f5d4 Big manual merge
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
CatalinScr d4ce7d626c Modified the menu
Pierre Bondoerffer f8c7140eec
make fonts big
Pierre Bondoerffer f6d45d05f6
use logo in toolbar
Caleb James DeLisle 5d70dd93b3 Manual merge
CatalinScr 15fa801bc8 work in progress
CatalinScr 89ab82c0e2 Changed the menu, added the logo on top bar
Pierre Bondoerffer ae176b0465
about page mockup
Pierre Bondoerffer 86bc14e6bb
new loading screen
Pierre Bondoerffer 304a29e210
Improve contact page
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad
Pierre Bondoerffer e2f8c9c5da
add logo to topbar
Pierre Bondoerffer cd0c9cc95a
create less templates for info pages
Pierre Bondoerffer f71b082aac
remove min-height globally, style footer
Pierre Bondoerffer 0fe49d6641
oops, sorry, back to 100% height
Pierre Bondoerffer dc0a037894
turn login and register into infopages
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 775ea81504
start register page
CatalinScr 69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page
Caleb James DeLisle 490e2b4d0a work in progress on migrating styles back into the infopages.less
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages
Caleb James DeLisle 896186d059 Fix some wrong less files which were breaking the UI of the apps
ansuz 4614d6ae81 remove legacy max-width from usage bar
CatalinScr 87dec4a091 Changed the font size
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive
Caleb James DeLisle 428bee6306 make links clickable and make more link work
yflory 3da76e3ae8 Update style for the todo app
CatalinScr 5fa20836cf Modified Register and login button
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo
CatalinScr 796bf89491 Update of the front-page
Caleb James DeLisle 49c760131e wip
Nicolas Lemoine 658b00814b TodoApp - Style and translations
Caleb James DeLisle 6a1ec54e2a wip
Pierre Bondoerffer dc9565f22f
make buttons colorful
Caleb James DeLisle 8404017af1 wip
yflory a80b00a765 Move the file picker in common
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page
yflory c33d2a2db0 New tooltips
yflory baf439648e Add the contacts app in the dropdown menu
yflory aa8181ab2b Contacts app translations
ansuz f2320190b8 change friends url to /contacts/
ansuz 6306de5265 set avatar border-radius to 4px
ansuz 33dcd2ae28 drop black border from avatars in userlist
ansuz e2c17dbeb4 resolve conflicts
yflory 557f13f796 Unfriend and update username - beta
ansuz 96d2ff67e1 user-plus as icon for add-friend
Caleb James DeLisle f6abdc2b86 manual merge of staging
yflory ac684a8dc7 Use the APP toolbar in profile
yflory b3e225cb3b Replace spinner by text and fix mobile UI
yflory 42075e4b5f Make everything 16px and 32px
yflory 16d0527e92 Add a page title in drive, settings and file
yflory 5d5f936682 Hide the upload table in code
yflory a0b14faf89 Fix the font in settings and drive
yflory 112c4c85e5 Left menu in drive
yflory 560671ae7d Make avatars circle
yflory 125018c8c3 New settings page
yflory c02fa39524 Make drive search bar blue
yflory 0157e04b10 Fix overflowing content in the home page
yflory e6188bfb63 Fix useradmin dropdown position
yflory e8f3df5a46 Clean less
yflory 159d72f33b Merge branch 'msg' into staging
yflory ff10c282d4 Avatar in the user admin button
ansuz 6f7c60bf12 Merge pull request from evalica/153
Issue : On Register, add spacing between checkboxes and labels
Ecaterina Moraru (Valica) e8e8858e44 Issue : On Register, add spacing between checkboxes and labels
Ecaterina Moraru (Valica) fc065a0484 Issue : Spacing between "Log-in" and "Register" buttons
- Removed ".first" class from Register button
- Increase spacing between buttons
yflory a5e8f6ae81 Add friend app and fix avatar size
ansuz f02285d103 fix lowercased p
yflory bf17ad3f1e Friend button in the userlist
yflory d7f9ddd8d2 Fix icon colors in the new menu (/pad app)
yflory cc67838786 Fix horizontal scrollbar in /pad anonymous mode
Caleb James DeLisle 25905d13fa wip
yflory 47c6c64b8a Allow emojis in default avatars
yflory ffd184d50e Fix overflowing names in the new userlist
yflory 1a27f11e73 Fix dropdown menus in static pages
yflory fa2d857d70 Fix css issues with Safari
yflory 1df5e6e855 Fix toolbar buttons for Safari
yflory 70c9f3df75 Fix avatar size
yflory 335898a4c7 Hack the drawer to close it when clicking outside
yflory b153dda6ff Add avatars in the user list
yflory b6944e6638 Fix userlist style in apps without iframe
yflory 568ce70afd Add a spinner for the history and update history buttons
yflory b9320e6005 Toolbar improvements
ansuz b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens
ansuz 0b9d7d6c0b fix color of links in poll and whiteboard
yflory 56a25e1036 Small fixes for the new toolbar
ansuz c53ebe3598 bring upload status container to the front
ansuz 7de2683169 make all apps use clientside templates
yflory c431041e3f Fix position of the rightside drawer with small screen