Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 63b9d4e9fd remove path for backwards compatibility 2017-01-10 10:54:08 +01:00
ansuz 4cda1aeb2f add docker and docker-compose
thanks @felixboehm
2017-01-10 10:36:12 +01:00
ansuz b39067d2a1 jshint compliance 2017-01-09 18:07:45 +01:00
ansuz 74a12f50ac only migrate keys which don't already exist 2017-01-09 17:35:58 +01:00
ansuz 1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
ansuz a3cd100c94 apply yflory's safari patch 2017-01-09 11:46:51 +01:00
ansuz 0373556475 support old hashes in /poll 2017-01-09 11:46:21 +01:00
ansuz 4902aebe77 open home page table links in new tabs 2017-01-09 11:01:29 +01:00
ansuz b33661d9d5 don't toggle maximization state after setting 2017-01-05 15:21:17 +01:00
ansuz 7868a65da9 apply style patches to the correct elements 2017-01-05 15:06:08 +01:00
ansuz 5c967ed09e apply live fixes to the codebase 2017-01-05 14:45:31 +01:00
ansuz bd6f2c037e assign the cors iframe an id 2017-01-05 14:27:40 +01:00
ansuz e56cc49f79 catch errors that popped up because of a cross-origin iframe 2017-01-05 14:14:26 +01:00
ansuz 5080751a90 hide unnecessary scrollbar 2017-01-05 10:58:10 +01:00
ansuz 95617a11c8 fix broken paths in old poll 2017-01-05 10:57:13 +01:00
ansuz 5a90d20cff open pads in a new tab 2017-01-04 16:41:47 +01:00
ansuz c380ecfcd9 add the slogan which was accidentally dropped 2017-01-04 16:35:32 +01:00
ansuz 05a956879a prepare new poll app for release
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz 6c4e070c82 update information pages 2017-01-03 15:25:41 +01:00
ansuz 7b87213ec3 extract more constants into less variables 2017-01-03 12:19:07 +01:00
ansuz 27d5559b0c define and use flags to enable the home page table 2017-01-03 12:17:17 +01:00
ansuz 5cd714b18a configure filestore usage via customize/application_config.js 2017-01-03 12:10:11 +01:00
ansuz 4b1f9fd4f1 Revert "yank dead code"
This reverts commit aad442cb20.
2017-01-03 11:49:44 +01:00
ansuz aad442cb20 yank dead code 2017-01-02 16:03:50 +01:00
ansuz 2b5085625c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-02 15:43:06 +01:00
ansuz f01c3725af move minor links to the bottom of the home page 2016-12-30 15:56:24 +01:00
ansuz 9b650362b9 rebuild css 2016-12-30 15:33:59 +01:00
ansuz d843caeb9a remove bottom bar and move language selector to main html 2016-12-30 15:33:28 +01:00
ansuz c6499d6789 make panel styles reusable 2016-12-30 15:30:35 +01:00
ansuz 773209472e break monolithic style file into several modules 2016-12-30 15:29:45 +01:00
ansuz 34967ac354 encapsulate rendering functions so we can pass in cryptpad-common 2016-12-30 13:27:01 +01:00
ansuz 66b8c93205 remember time of first visit 2016-12-30 13:23:09 +01:00
ansuz ba4df1a22c create examples directory with old prototypes 2016-12-30 13:22:15 +01:00
ansuz 0abf45bdc5 better fsStore debugging 2016-12-30 12:27:58 +01:00
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
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
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
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
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
ansuz 1f762ce55b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 17:27:59 +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
ansuz 9dbe583f4b Merge branch 'soon' into staging 2016-12-20 11:27:26 +01:00
ansuz 835c33113e Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon 2016-12-20 11:25:09 +01:00
ansuz 6778a7062d Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 11:23:54 +01:00
ansuz 5a39caf95a new messages for login 2016-12-20 11:16:49 +01:00
ansuz bd6992da0a create a random hash 2016-12-20 11:13:15 +01:00
ansuz 2cd50498c2 add log(in|out) functions to common 2016-12-20 11:11:40 +01:00
ansuz dfea802c77 better crypto hygeine, start thinking more about ui 2016-12-20 11:09:41 +01:00