dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,513 Commits 74 Branches 132 Tags 560 MiB
Commit Graph

3513 Commits

Author SHA1 Message Date
ansuz ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-08 10:03:54 +02:00
Caleb James DeLisle a612f02be2 Merge branch 'staging' into pad2 2017-08-07 17:49:03 +02:00
ansuz c63807fd2b implement channel.send 2017-08-07 17:24:16 +02:00
Caleb James DeLisle 35a55a15ed wip 2017-08-07 17:23:28 +02:00
ansuz d835005905 simplify in-memory message format 2017-08-07 17:22:56 +02:00
Pierre Bondoerffer 8f285eba9f
make file picker ui even prettier 2017-08-07 17:22:54 +02:00
ansuz 797cc2b105 handle messages which fail to decrypt 2017-08-07 17:21:23 +02:00
Caleb James DeLisle 65dfd99171 major wip 2017-08-07 16:27:57 +02:00
Pierre Bondoerffer c53e738054
improve file picker ui 2017-08-07 16:27:29 +02:00
Pierre Bondoerffer 798a3dc520
automatically fill in display name in poll 2017-08-07 12:19:21 +02:00
Pierre Bondoerffer 0588564bc9
overflow on poll div 2017-08-07 11:49:10 +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
Caleb James DeLisle 548bce479a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-07 10:53:27 +02:00
Pierre Bondoerffer be29236af1
fix pdfjs styles 2017-08-07 10:47:30 +02:00
ansuz bad5160885 fix bad reference 2017-08-05 09:14:36 +02:00
ansuz 05aa5ed347 hide new feature until it is finished 2017-08-04 18:07:47 +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
ansuz 244f436f6e resolve merge conflict 2017-08-04 16:01:20 +02:00
ansuz 2a8311396e lint compliance 2017-08-04 16:00:06 +02:00
ansuz 395f6e1b27 reset confirm text for alertify 2017-08-04 15:54:15 +02:00
Caleb James DeLisle eaf5c73b05 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into front-page 2017-08-04 15:47:34 +02:00
ansuz dd6a057962 add 'msg' class for pierre 2017-08-04 15:45:30 +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
ansuz c895d06193 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 14:26:31 +02:00
ansuz 252f40748a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 14:21:26 +02:00