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 |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
7 years ago |
|
Pierre Bondoerffer
|
280c10c57d
|
alertify: use the right box-shadow
|
7 years ago |
|
Pierre Bondoerffer
|
82352b422f
|
unhide show help button
|
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
|
ca686f9c92
|
(hopefully) fix newline in lists when pasting links
|
7 years ago |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
7 years ago |
|
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
7 years ago |
|
Pierre Bondoerffer
|
355b7f1839
|
change recent to local pads
|
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
|
996c56c242
|
fix label in register
|
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
|
a16d4be3c4
|
show logged in user
|
7 years ago |
|
Pierre Bondoerffer
|
8a56adfe53
|
make logos same size, compress
|
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 |
|
Caleb James DeLisle
|
0f7124d673
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
ecc766eb7b
|
remove useless margin
|
7 years ago |
|
Caleb James DeLisle
|
a6547d1ed0
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
7310960f46
|
remove the hack around the hack to fix the hack
|
7 years ago |
|
Caleb James DeLisle
|
95c7cd3fcc
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
addd91cc72
|
fix styles (again) copyright cjd 2017
|
7 years ago |
|
Caleb James DeLisle
|
930ba8aec6
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
5c21a9048e
|
fix styles
|
7 years ago |
|
Caleb James DeLisle
|
b26c62714f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
c953e71a18
|
better class generation and remove duplicate class
|
7 years ago |
|
Caleb James DeLisle
|
4d563af045
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
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 |
|
ansuz
|
96b12d55fb
|
add a return
|
7 years ago |
|
ansuz
|
b79adf4177
|
redirect to drive if logged in
|
7 years ago |
|
Caleb James DeLisle
|
a10214ed2a
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Caleb James DeLisle
|
75c0876500
|
Added ludovic's bio
|
7 years ago |
|
CatalinScr
|
043ae4280b
|
repaired the menu
|
7 years ago |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
7 years ago |
|
Pierre Bondoerffer
|
e2ad99ab3c
|
change favicon (again)
|
7 years ago |
|
Pierre Bondoerffer
|
8831f4f91b
|
new favicons
|
7 years ago |
|
Pierre Bondoerffer
|
a70c527482
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page
|
7 years ago |
|
Pierre Bondoerffer
|
4018c7e0a6
|
move alertify stuff
|
7 years ago |
|
Caleb James DeLisle
|
c274a27dfb
|
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
|
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 |
|
Pierre Bondoerffer
|
1b83e15796
|
sorry jpg, i forgot you existed
|
7 years ago |
|
Pierre Bondoerffer
|
5ce7d64b2c
|
add pierre photo
|
7 years ago |
|
Caleb James DeLisle
|
1b466d250f
|
Add some photos
|
7 years ago |
|
Caleb James DeLisle
|
5d70dd93b3
|
Manual merge
|
7 years ago |
|
CatalinScr
|
15fa801bc8
|
work in progress
|
7 years ago |
|
Caleb James DeLisle
|
bc15ce7de5
|
Manual merge
|
7 years ago |
|
Caleb James DeLisle
|
52e9ba92fa
|
Update whitepaper link and also change whatis_zeroknowledge
|
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
|
cdf6345fc1
|
use sign up
|
7 years ago |
|
Pierre Bondoerffer
|
ddc9c4d070
|
alt favicon pink
|
7 years ago |
|
ansuz
|
35867001cb
|
add missing messages
|
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
|
b3f3f1dabb
|
Add What is CryptPad keys
|
7 years ago |
|
Pierre Bondoerffer
|
e2f8c9c5da
|
add logo to topbar
|
7 years ago |
|
Pierre Bondoerffer
|
8a56029bfe
|
remove useless images
|
7 years ago |
|
Pierre Bondoerffer
|
ea3a8932be
|
put the content in the right place
|
7 years ago |
|
Pierre Bondoerffer
|
262a729ef7
|
use proper key name
|
7 years ago |
|
Pierre Bondoerffer
|
db111257f0
|
Add translations, remove useless functions
|
7 years ago |
|
Pierre Bondoerffer
|
de23195bd8
|
fix wrong css class
|
7 years ago |
|
Pierre Bondoerffer
|
ad4aca4e5f
|
actually do the changes intended in previous commit
|
7 years ago |
|
Pierre Bondoerffer
|
01b2883771
|
Add headers and footers, generate what-is-cryptpad
|
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
|
5ef0325d90
|
this are css rules modified -- INSERT --
|
7 years ago |
|
CatalinScr
|
5921073524
|
Updated the new font, changed the logo, changed see more
|
7 years ago |
|
Pierre Bondoerffer
|
ba95931802
|
Use translation keys
|
7 years ago |
|
ansuz
|
9a733cca0e
|
drop support for legacy iframe
|
7 years ago |
|
Pierre Bondoerffer
|
f2a78ddfd9
|
New FR/ES keys
|
7 years ago |
|
CatalinScr
|
6862bda454
|
Changed the logo, uploaded the new font, repaired responsive
|
7 years ago |
|
ansuz
|
1ca00e7e01
|
resolve merge conflicts
|
7 years ago |
|
ansuz
|
411c64df85
|
Merge branch 'master' into master
|
7 years ago |
|
Pierre Bondoerffer
|
93e007b52a
|
reduce png sizes
|
7 years ago |
|
ansuz
|
777dea2014
|
Merge branch 'staging' into todo
|
7 years ago |
|
ansuz
|
a458d7fa46
|
bump to latest version
|
7 years ago |
|
Caleb James DeLisle
|
428bee6306
|
make links clickable and make more link work
|
7 years ago |
|
ansuz
|
ba9cab762c
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
7 years ago |
|
yflory
|
459e0b3b16
|
CSS and bug fixes for todo
|
7 years ago |
|
ansuz
|
a5b19b1cdd
|
add missing translations
|
7 years ago |
|
yflory
|
77d6da841f
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
7 years ago |
|
yflory
|
3da76e3ae8
|
Update style for the todo app
|
7 years ago |
|
ansuz
|
8cfd8d3270
|
add translations for todo
|
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 |
|
c4rl0sc
|
2e8e44933a
|
Fixed spelling error in Spanish translation
|
7 years ago |
|
ansuz
|
dcf5719eaf
|
handle most of the boilerplate stuff
|
7 years ago |
|
c4rl0sc
|
064e189495
|
Fixed spelling issues and improved translation quality.
|
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 |
|
ansuz
|
76e69f0ba8
|
Merge pull request #127 from gustavohmsilva/master
Merged translated and non-translated in pt-BR
|
7 years ago |
|
ansuz
|
52fa77e961
|
Merge pull request #157 from MacLemon/reduce-image-asset-size
File size reduction and optimization of new image assets
|
7 years ago |
|
Gustavo H M Silva
|
6785f166fd
|
Merge branch 'master' into master
|
7 years ago |
|
ansuz
|
6622735db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
55cb0734e2
|
make bad state timeout configurable
|
7 years ago |
|
MacLemon
|
25cba8bba3
|
Translated missing out.presentSuccess to german
|
7 years ago |
|
MacLemon
|
29bfcfa719
|
File size reduction and optimization of new image assets
|
7 years ago |
|
yflory
|
a80b00a765
|
Move the file picker in common
|
7 years ago |
|
yflory
|
9633025afe
|
CSS for the removeHistory button in contacts
|
7 years ago |
|
ansuz
|
b22127f10c
|
add history removal
|
7 years ago |
|
Caleb James DeLisle
|
ffb5e555a0
|
Merge branch 'staging' into front-page
|
7 years ago |
|
yflory
|
c33d2a2db0
|
New tooltips
|
7 years ago |
|
yflory
|
82c87144cb
|
Remove the friend request button when the request is sent
|
7 years ago |
|
yflory
|
1dc98dcff1
|
CSS for the contacts input field
|
7 years ago |
|
yflory
|
26fa914982
|
Missing translation keys
|
7 years ago |
|
Pierre Bondoerffer
|
a2c2e98060
|
Spanish update
|
7 years ago |
|
yflory
|
6aab1c94b2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
baf439648e
|
Add the contacts app in the dropdown menu
|
7 years ago |
|
ansuz
|
5716f76c91
|
fix typo in translations
|
7 years ago |
|
yflory
|
743b87b70f
|
Add initial text in /contacts
|
7 years ago |
|
yflory
|
aa8181ab2b
|
Contacts app translations
|
7 years ago |
|
ansuz
|
0cd94e2ba8
|
add title to contacts app
|
7 years ago |
|
ansuz
|
f2320190b8
|
change friends url to /contacts/
|
7 years ago |
|
ansuz
|
06c971ec47
|
s/friend/contact/g
|
7 years ago |
|
ansuz
|
2e0aa185cd
|
uppercase first letter of new translation keys
|
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
|
7be1e249e1
|
add fa-share-alt to pad initialText
|
7 years ago |
|
ansuz
|
96d2ff67e1
|
user-plus as icon for add-friend
|
7 years ago |
|
ansuz
|
bf9c2b0b84
|
new messages
|
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
|
2d509e3e25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
7 years ago |
|
ansuz
|
3453e54357
|
bump footer and package.json for upcoming version
|
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
|
59213a9c4e
|
Typo
|
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
|
8e2e8b1653
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
7 years ago |
|
ansuz
|
52eb8e307c
|
feedback for language used
|
7 years ago |
|
ansuz
|
086e5909dd
|
Merge branch 'soon' into staging
|
7 years ago |
|
ansuz
|
4a37bc4a1c
|
abort the realtime session if it does not synchronize for 30 seconds
|
7 years ago |
|
ansuz
|
c60a71e210
|
add connect button and view profile button
|
7 years ago |
|
ansuz
|
6f7c60bf12
|
Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
|
8 years ago |
|
Ecaterina Moraru (Valica)
|
e8e8858e44
|
Issue #153: On Register, add spacing between checkboxes and labels
|
8 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
|
8 years ago |
|
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
8 years ago |