Commit graph

1350 commits

Author SHA1 Message Date
ansuz
e3f79f914a fix user hash 2016-12-29 18:12:30 +01:00
ansuz
d232a5a83e Revert "simplify key generation and remember user's additional keys"
This reverts commit 75786ff9ff.
2016-12-29 17:51:58 +01:00
ansuz
fefe444501 add new translation keys 2016-12-29 17:11:30 +01:00
ansuz
91a806ab86 focus on OK button when we pop an alert 2016-12-29 17:10:59 +01:00
ansuz
850bd42149 don't try to display things that don't exist 2016-12-29 17:05:28 +01:00
ansuz
75786ff9ff simplify key generation and remember user's additional keys 2016-12-29 17:04:48 +01:00
ansuz
621476424d make strings translatable and refocus on correct input 2016-12-29 17:04:01 +01:00
ansuz
a97696c712 show user's display name and account name 2016-12-29 17:03:17 +01:00
ansuz
0c9178ba46 update slide styles, comment alertify styles, updated compiled css 2016-12-28 17:33:46 +01:00
ansuz
ec92640974 ignore scratch directory 2016-12-28 17:24:40 +01:00
ansuz
3560f0580f commit prototype upload script 2016-12-28 17:23:57 +01:00
ansuz
d7bdb30969 don't compile alertify.css directly 2016-12-28 17:20:29 +01:00
ansuz
2f9f3d921a trim excess whitespace from usernames 2016-12-28 17:13:41 +01:00
ansuz
89e5830409 make alertify display time configurable 2016-12-28 17:13:00 +01:00
ansuz
32d7fc55d2 make it easier to add pages at the document root 2016-12-28 17:11:06 +01:00
ansuz
8b9d7f2357 update built html 2016-12-28 17:10:38 +01:00
ansuz
6a46d6e06c update page layout and account for about page 2016-12-28 17:09:21 +01:00
ansuz
49d80d91d9 don't load customize/pad.js anymore 2016-12-28 15:53:27 +01:00
ansuz
a5407e9222 rework templates and build system 2016-12-28 15:52:16 +01:00
ansuz
c9d99f101a rewrite customize/readme.md 2016-12-28 15:33:59 +01:00
ansuz
13e8bf5b5e remove old 'user' code 2016-12-28 15:33:40 +01:00
ansuz
f0a4c0ccb0 sheet.js is never used 2016-12-28 15:24:04 +01:00
ansuz
2be90e8858 remove Header.html 2016-12-28 15:18:39 +01:00
ansuz
0a89f13498 don't need /customize/pad.js anymore 2016-12-28 15:15:25 +01:00
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