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 |
|
CatalinScr
|
796bf89491
|
Update of the front-page
|
7 years ago |
|
Caleb James DeLisle
|
49c760131e
|
wip
|
7 years ago |
|
Nicolas Lemoine
|
658b00814b
|
TodoApp - Style and translations
|
7 years ago |
|
Caleb James DeLisle
|
6a1ec54e2a
|
wip
|
7 years ago |
|
Pierre Bondoerffer
|
dc9565f22f
|
make buttons colorful
|
7 years ago |
|
Caleb James DeLisle
|
8404017af1
|
wip
|
7 years ago |
|
yflory
|
a80b00a765
|
Move the file picker in common
|
7 years ago |
|
Caleb James DeLisle
|
ffb5e555a0
|
Merge branch 'staging' into front-page
|
7 years ago |
|
yflory
|
c33d2a2db0
|
New tooltips
|
7 years ago |
|
yflory
|
baf439648e
|
Add the contacts app in the dropdown menu
|
7 years ago |
|
yflory
|
aa8181ab2b
|
Contacts app translations
|
7 years ago |
|
ansuz
|
f2320190b8
|
change friends url to /contacts/
|
7 years ago |
|
ansuz
|
6306de5265
|
set avatar border-radius to 4px
|
7 years ago |
|
ansuz
|
33dcd2ae28
|
drop black border from avatars in userlist
|
7 years ago |
|
ansuz
|
e2c17dbeb4
|
resolve conflicts
|
7 years ago |
|
yflory
|
557f13f796
|
Unfriend and update username - beta
|
7 years ago |
|
ansuz
|
96d2ff67e1
|
user-plus as icon for add-friend
|
7 years ago |
|
Caleb James DeLisle
|
f6abdc2b86
|
manual merge of staging
|
7 years ago |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
7 years ago |
|
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
7 years ago |
|
yflory
|
42075e4b5f
|
Make everything 16px and 32px
|
7 years ago |
|
yflory
|
16d0527e92
|
Add a page title in drive, settings and file
|
7 years ago |
|
yflory
|
5d5f936682
|
Hide the upload table in code
|
7 years ago |
|
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
7 years ago |
|
yflory
|
112c4c85e5
|
Left menu in drive
|
7 years ago |
|
yflory
|
560671ae7d
|
Make avatars circle
|
7 years ago |
|
yflory
|
125018c8c3
|
New settings page
|
7 years ago |
|
yflory
|
c02fa39524
|
Make drive search bar blue
|
7 years ago |
|
yflory
|
0157e04b10
|
Fix overflowing content in the home page
|
7 years ago |
|
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
7 years ago |
|
yflory
|
e8f3df5a46
|
Clean less
|
7 years ago |
|
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
7 years ago |
|
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
7 years ago |
|
ansuz
|
6f7c60bf12
|
Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
|
7 years ago |
|
Ecaterina Moraru (Valica)
|
e8e8858e44
|
Issue #153: On Register, add spacing between checkboxes and labels
|
7 years ago |
|
Ecaterina Moraru (Valica)
|
fc065a0484
|
Issue #151: Spacing between "Log-in" and "Register" buttons
- Removed ".first" class from Register button
- Increase spacing between buttons
|
7 years ago |
|
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
7 years ago |
|
ansuz
|
f02285d103
|
fix lowercased p
|
7 years ago |
|
yflory
|
bf17ad3f1e
|
Friend button in the userlist
|
7 years ago |
|
yflory
|
d7f9ddd8d2
|
Fix icon colors in the new menu (/pad app)
|
8 years ago |
|
yflory
|
cc67838786
|
Fix horizontal scrollbar in /pad anonymous mode
|
8 years ago |
|
Caleb James DeLisle
|
25905d13fa
|
wip
|
8 years ago |
|
yflory
|
47c6c64b8a
|
Allow emojis in default avatars
|
8 years ago |
|
yflory
|
ffd184d50e
|
Fix overflowing names in the new userlist
|
8 years ago |
|
yflory
|
1a27f11e73
|
Fix dropdown menus in static pages
|
8 years ago |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
8 years ago |
|
yflory
|
1df5e6e855
|
Fix toolbar buttons for Safari
|
8 years ago |
|
yflory
|
70c9f3df75
|
Fix avatar size
|
8 years ago |
|
yflory
|
335898a4c7
|
Hack the drawer to close it when clicking outside
|
8 years ago |
|
yflory
|
b153dda6ff
|
Add avatars in the user list
|
8 years ago |
|
yflory
|
b6944e6638
|
Fix userlist style in apps without iframe
|
8 years ago |
|
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
8 years ago |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
8 years ago |
|
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
8 years ago |
|
ansuz
|
0b9d7d6c0b
|
fix color of links in poll and whiteboard
|
8 years ago |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
8 years ago |
|
ansuz
|
c53ebe3598
|
bring upload status container to the front
|
8 years ago |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
|
yflory
|
c431041e3f
|
Fix position of the rightside drawer with small screen
|
8 years ago |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
8 years ago |