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
|
789a923792
|
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
|
7 years ago |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
7 years ago |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
7 years ago |
|
Pierre Bondoerffer
|
c953e71a18
|
better class generation and remove duplicate class
|
8 years ago |
|
Pierre Bondoerffer
|
6614f3f0e6
|
put the page class on html element
|
8 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
|
8 years ago |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
8 years ago |
|
CatalinScr
|
69c470330f
|
updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
|
8 years ago |
|
CatalinScr
|
e609950977
|
Changed the favicon, added the boostrap js file, reconfigure the top menu
|
8 years ago |
|
Caleb James DeLisle
|
cd2b41f51e
|
Fix up some less for supporting the info-pages
|
8 years ago |
|
ansuz
|
777dea2014
|
Merge branch 'staging' into todo
|
8 years ago |
|
ansuz
|
a458d7fa46
|
bump to latest version
|
8 years ago |
|
ansuz
|
dcf5719eaf
|
handle most of the boilerplate stuff
|
8 years ago |
|
Caleb James DeLisle
|
8404017af1
|
wip
|
8 years ago |
|
ansuz
|
f2320190b8
|
change friends url to /contacts/
|
8 years ago |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
8 years ago |
|
ansuz
|
3453e54357
|
bump footer and package.json for upcoming version
|
8 years ago |
|
yflory
|
125018c8c3
|
New settings page
|
8 years ago |
|
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
8 years ago |
|
ansuz
|
4016a95540
|
prototype invite app
|
8 years ago |
|
ansuz
|
c2e153e8ed
|
more fouc fixes
|
8 years ago |
|
ansuz
|
8ffad5ece6
|
FOUC fixes
|
8 years ago |
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
8 years ago |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
|
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
8 years ago |
|
ansuz
|
3a9b480e4e
|
resolve merge conflicts in template.js
|
8 years ago |
|
yflory
|
40f4fc2682
|
Add the profile app in template.js
|
8 years ago |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
8 years ago |
|
ansuz
|
bd1db735dd
|
jshint compliance
|
8 years ago |
|
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
8 years ago |
|
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
8 years ago |