Commit graph

1295 commits

Author SHA1 Message Date
Caleb James DeLisle
4402ea9966 typo in config.dist 2017-01-26 16:34:00 +01:00
yflory
f8455875a9 Fix the NoScript (iframe not loaded) bug with inner iframes 2017-01-23 15:07:38 +01:00
yflory
82caa1aa8b Fix the Noscript bug 2017-01-23 12:30:07 +01:00
Caleb James DeLisle
516e25f0dc Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-01-12 17:58:29 +01:00
Caleb James DeLisle
a8ba798203 Stop doing tests on pull requests because they're always going to fail 2017-01-12 17:58:12 +01:00
yflory
605072cfbf Fix empty title with new documents 2017-01-12 15:15:10 +01:00
yflory
4963c77b61 Fix the title reset bug 2017-01-12 14:29:40 +01:00
Caleb James DeLisle
52d5821be0 Run the tests on all of the permanent branches 2017-01-12 12:09:16 +01:00
Caleb James DeLisle
35a853ffff Stop failing tests over missing translations because otherwise they'll almost never be passing. 2017-01-12 12:06:44 +01:00
Caleb James DeLisle
512c1b12f4 Make the selenium test log the content of the /assert report to the console 2017-01-12 12:03:14 +01:00
Caleb James DeLisle
6c5e8d3118 Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up 2017-01-11 18:00:41 +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
yflory
0abec4ddb3 Fix error with placeholder translations in Safari 2017-01-09 11:50:45 +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
yflory
69b1764c9d Missing entries in the context menu with users 2017-01-02 15:42:29 +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