Commit Graph

975 Commits (5821d3e72f2e48694090bf114e98ec7765273c53)

Author SHA1 Message Date
Pierre Bondoerffer 82352b422f
unhide show help button 2017-08-09 11:24:28 +02:00
Pierre Bondoerffer ec011b15d5
remove duplicate css property 2017-08-09 10:55:36 +02:00
Pierre Bondoerffer 34ba673cd3
improve file upload UI 2017-08-09 10:54:20 +02:00
Pierre Bondoerffer ca686f9c92
(hopefully) fix newline in lists when pasting links 2017-08-08 17:47:10 +02:00
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 2017-08-08 16:51:23 +02:00
Pierre Bondoerffer 2cc6c636db
Add some missing titles 2017-08-08 16:20:31 +02:00
Pierre Bondoerffer 355b7f1839
change recent to local pads 2017-08-08 12:05:22 +02:00
Pierre Bondoerffer 90075cd48e
media-tag to less file 2017-08-08 12:01:39 +02:00
Pierre Bondoerffer 88be5444f0
change alertify warn color 2017-08-08 10:37:37 +02:00
Pierre Bondoerffer c53e738054
improve file picker ui 2017-08-07 16:27:29 +02:00
Pierre Bondoerffer 996c56c242
fix label in register 2017-08-07 11:41:04 +02:00
Pierre Bondoerffer 008fa12755
alertify: add textarea + checkbox 2017-08-07 11:26:40 +02:00
Pierre Bondoerffer e486e47aa1
alertify: fix input color + better log styles 2017-08-07 11:19:20 +02:00
Pierre Bondoerffer e333e7903d
fix styles overlapping 2017-08-04 17:44:02 +02:00
Pierre Bondoerffer 1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 17:15:55 +02:00
Pierre Bondoerffer dac14de18c
unify fonts 2017-08-04 17:15:45 +02:00
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 17:58:48 +03:00
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about 2017-08-04 17:58:29 +03:00
Pierre Bondoerffer a16d4be3c4
show logged in user 2017-08-04 16:48:01 +02:00
Pierre Bondoerffer 8a56adfe53
make logos same size, compress 2017-08-04 16:25:39 +02:00
Pierre Bondoerffer d3fb6313b6
color logo on topbar 2017-08-04 16:22:43 +02:00
Pierre Bondoerffer 865ba0731c
better colors? not sure yet... 2017-08-04 16:13:27 +02:00
Pierre Bondoerffer 1bd42f0b3e
make alertify darker 2017-08-04 16:02:35 +02:00
Caleb James DeLisle 0f7124d673 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 15:26:59 +02:00
Pierre Bondoerffer ecc766eb7b
remove useless margin 2017-08-04 15:24:58 +02:00
Caleb James DeLisle a6547d1ed0 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 15:20:14 +02:00
Pierre Bondoerffer 7310960f46
remove the hack around the hack to fix the hack 2017-08-04 15:19:59 +02:00
Caleb James DeLisle 95c7cd3fcc Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 15:17:22 +02:00
Pierre Bondoerffer addd91cc72
fix styles (again) copyright cjd 2017 2017-08-04 15:16:48 +02:00
Caleb James DeLisle 930ba8aec6 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 15:13:09 +02:00
Pierre Bondoerffer 5c21a9048e
fix styles 2017-08-04 15:13:03 +02:00
Caleb James DeLisle b26c62714f Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 15:08:21 +02:00
Pierre Bondoerffer c953e71a18
better class generation and remove duplicate class 2017-08-04 15:06:58 +02:00
Caleb James DeLisle 4d563af045 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 14:51:14 +02:00
Pierre Bondoerffer 10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 14:50:44 +02:00
Pierre Bondoerffer 6614f3f0e6
put the page class on html element 2017-08-04 14:50:35 +02:00
ansuz 96b12d55fb add a return 2017-08-04 14:37:21 +02:00
ansuz b79adf4177 redirect to drive if logged in 2017-08-04 14:35:47 +02:00
Caleb James DeLisle a10214ed2a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 14:19:54 +02:00
Caleb James DeLisle 75c0876500 Added ludovic's bio 2017-08-04 14:19:44 +02:00
CatalinScr 043ae4280b repaired the menu 2017-08-04 15:15:47 +03:00
CatalinScr 250d85bb8a Repaired the menu, clead the code 2017-08-04 15:15:35 +03:00
Pierre Bondoerffer e2ad99ab3c
change favicon (again) 2017-08-04 14:06:10 +02:00
Pierre Bondoerffer 8831f4f91b
new favicons 2017-08-04 14:02:53 +02:00
Pierre Bondoerffer a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page 2017-08-04 12:32:26 +02:00
Pierre Bondoerffer 4018c7e0a6
move alertify stuff 2017-08-04 12:31:47 +02:00
Caleb James DeLisle c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js 2017-08-04 11:33:28 +02:00
Caleb James DeLisle 0d1f19f5d4 Big manual merge 2017-08-04 11:20:17 +02:00
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
2017-08-04 12:16:33 +03:00
CatalinScr d4ce7d626c Modified the menu 2017-08-04 12:16:13 +03:00