1226 Commits

Author SHA1 Message Date
ansuz
f020fd5a75 remove /customize/pad.js from main apps 2016-12-28 15:12:22 +01:00
ansuz
aae443c8e9 replace old poll app with new 2016-12-28 11:44:48 +01:00
ansuz
387f4ebf5d add this important js file I forgot 2016-12-28 11:01:14 +01:00
ansuz
8f0de589dc add missing cp class to more html 2016-12-28 10:45:14 +01:00
ansuz
46024853ec restrict cryptpad styles to descendants of .cp 2016-12-27 14:30:27 +01:00
ansuz
e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
ansuz
5a4ec358b3 Merge branch 'soon' into staging 2016-12-27 13:36:23 +01:00
ansuz
71488e6651 add link to markdown tutorial 2016-12-27 13:36:02 +01:00
ansuz
bc49e143b8 give alertify popups their own bg var 2016-12-27 12:34:31 +01:00
ansuz
8b034a9554 better flow and animations for login page 2016-12-27 12:32:20 +01:00
ansuz
db12b5e896 move text for login page into translation file 2016-12-27 12:31:16 +01:00
ansuz
f9da200381 resolve merge conflicts in translations 2016-12-26 14:25:02 +01:00
ansuz
5e1d8292c5 guard against trying to parse special fragments 2016-12-26 14:23:17 +01:00
ansuz
51067430f9 more restructuring of user app 2016-12-26 14:19:29 +01:00
ansuz
a4ed2388e2 use 'box' class 2016-12-26 14:19:02 +01:00
ansuz
eb620bee77 restructure user application 2016-12-26 14:17:39 +01:00
yflory
a10eac2773 Fix lint errors 2016-12-22 18:16:38 +01:00
ansuz
4476fd4006 s/readOnly/readonly 2016-12-22 18:15:18 +01:00
ansuz
a4690239d3 Merge branch 'master' of github.com:pbondoer/cryptpad into espanol 2016-12-22 18:09:29 +01:00
ansuz
52a593c2c2 fix jshint complaints 2016-12-22 17:27:56 +01:00
ansuz
25c8ea464b Merge branch 'soon' into login 2016-12-22 17:22:42 +01:00
ansuz
53a4d4738a really make sure you're logged out 2016-12-22 17:22:32 +01:00
ansuz
63cd5c16ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 17:20:30 +01:00
yflory
81259fc25f Refresh unsorted and templates when files data changes 2016-12-22 17:20:05 +01:00
ansuz
5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 16:54:51 +01:00
ansuz
21360801de change a few english keys 2016-12-22 16:54:17 +01:00
yflory
9b6c9e3891 Add support for templates in the file manager 2016-12-22 16:53:38 +01:00
ansuz
acfc27f5c5 fix merge conflicts 2016-12-22 16:53:03 +01:00
ansuz
3197b62fbb latest work 2016-12-22 16:44:49 +01:00
ansuz
29d406b7a9 implement cryptput 2016-12-22 16:00:13 +01:00
ansuz
84d5e4b35d better tools for playing with template code 2016-12-22 11:03:44 +01:00
yflory
1772cc93c8 Fix the taildoc bug 2016-12-22 11:02:12 +01:00
Pierre BONDOERFFER
3b10217fb0 fixed buttons breaking responsive layout 2016-12-22 04:54:28 +01:00
Pierre BONDOERFFER
f5e7a6f0c8 Fixed up Spanish translation 🇪🇸 2016-12-22 03:34:31 +01:00
Pierre BONDOERFFER
87582d41a9 Added alt tags to English translation 2016-12-22 03:34:12 +01:00
yflory
87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
ansuz
86cda4357b handle more possible cases 2016-12-21 18:24:48 +01:00
ansuz
1682d23c1c remove old user prototype 2016-12-21 18:06:05 +01:00
yflory
046220f239 Add info boxes for the different categories 2016-12-21 11:46:49 +01:00
yflory
403ba53980 Fix typo error 2016-12-21 10:22:48 +01:00
yflory
e9418af88b Add an info box in the file manager 2016-12-20 18:59:50 +01:00
ansuz
1f762ce55b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 17:27:59 +01:00
yflory
c359c27997 Use user object as default store in file manager 2016-12-20 17:27:45 +01:00
ansuz
820537f7e3 rebuild css 2016-12-20 16:54:53 +01:00
ansuz
4991bfab92 rebuild css 2016-12-20 16:54:36 +01:00
ansuz
280a6c462a implement white image correctly 2016-12-20 16:42:14 +01:00
ansuz
5c46fa7c65 implement white image correctly 2016-12-20 16:41:05 +01:00
yflory
4aed585574 Fix style issues in the toolbar 2016-12-20 14:40:00 +01:00
yflory
f9db7e588e Fix unused backup in localStorage 2016-12-20 14:37:29 +01:00
yflory
959983cc8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 11:31:06 +01:00