Commit Graph

13533 Commits (20ecef4d024f751481645db3aa68d098e1251b19)

Author SHA1 Message Date
Joey Hess ad8cb6d6fa Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-07-18 17:39:28 -04:00
Joey Hess e674bb1445 fix other 2 cases of conflicting destdir files
Cleanly fixed case where destdir file failed to be written because there
was a directory with the same name. This can be detected with no extra
system calls, and dealt with by finding all pages that wrote files
inside the directory, and removing them and the directory.

The other, inverse case would be expensive to detect in will_render,
since it would need to check each parent directory of the file to see
if the directory is really a conflicting file. But prep_writefile
already does a similar scan for symlinks in the path, so I added code
there to remove the conflicting file. This fix assumes that the file
is written using writefile, and not some other means (but using other means
would be a security hole too, so hopefully nothing does).
2010-07-18 17:38:35 -04:00
Joey Hess 1dbb2632ef another class of conflicts: subdir/file conflicts 2010-07-18 17:16:39 -04:00
Joey Hess 2bf3a6edbb check oldrenderedfiles too
Handles the case where foo.mdwn is moved too foo/index.html
2010-07-18 16:47:52 -04:00
Joey Hess d6cb4436bd 2 more cases 2010-07-18 16:45:44 -04:00
Joey Hess 773db5a35e avoid error if two source files render the same destination file
There are two sub-caces. If both source files still exist, the winner that
renders the destination file is undefined. If one source file is deleted
and the other added, in a refresh, the new file will take over the
destination file.
2010-07-18 16:28:39 -04:00
Joey Hess 775fefeea7 class of bugs I am working on 2010-07-18 13:52:03 -04:00
Joey Hess a291f24be6 some other (similar) failure cases 2010-07-18 13:50:06 -04:00
http://weakish.myopenid.com/ 9ea48dd49b this plugin is different from the [[html]] plugin and it is safe in most cases. 2010-07-18 14:07:06 +00:00
bento 7089c61b67 typo 2010-07-17 20:30:54 +00:00
bento 709e934a2b support-statement 2010-07-17 20:29:56 +00:00
Joey Hess bfa4660df7 update 2010-07-17 13:30:08 -04:00
Joey Hess c9dd98cf94 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-07-17 13:25:03 -04:00
Joey Hess 4142308429 turning into complete source file conflict test suite 2010-07-17 13:24:40 -04:00
https://mukund.startssl.com/ df925b72fe Add Banu 2010-07-17 11:56:40 +00:00
Joey Hess a72193a816 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-07-16 16:11:36 -04:00
Joey Hess fd842e03e6 add 2 failing test cases 2010-07-16 16:11:24 -04:00
Joey Hess 936dc6fc8e add test of file replace 2010-07-16 16:07:51 -04:00
http://joey.kitenet.net/ 855cfd0ec7 Added a comment 2010-07-16 19:44:55 +00:00
Jonas Smedegaard 296955ea37 Fix a couple of grammar errors. 2010-07-16 19:52:06 +02:00
tkane 39701647be 2010-07-16 13:18:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE 3b15f0a07b Added a comment 2010-07-15 15:37:31 +00:00
Joey Hess 7a04e2d416 add getsetup hook 2010-07-14 14:47:29 -04:00
Joey Hess d420a4bdec add section to getsetup info 2010-07-14 14:47:17 -04:00
Joey Hess c4cee4cfc5 add 2 more missing getsetup hooks 2010-07-14 14:44:40 -04:00
Joey Hess f54c1c5b95 note on escaping 2010-07-14 14:39:20 -04:00
Joey Hess ba4434d70b escape example wikilink 2010-07-14 14:38:25 -04:00
Joey Hess d47c63b47f response 2010-07-14 14:37:21 -04:00
Joey Hess dac8da27f3 more detail on manual moderation 2010-07-14 14:32:16 -04:00
Joey Hess 2035697cef respond 2010-07-14 14:29:57 -04:00
Joey Hess 2a5199f011 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-07-14 14:28:00 -04:00
Joey Hess 2d24281a3a Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have the caching problem that was added to work around). Closes: #588623 2010-07-14 14:27:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE eda2357c3e 2010-07-14 14:54:25 +00:00
http://hendry.iki.fi/ 231886e851 2010-07-14 14:25:10 +00:00
http://hendry.iki.fi/ 37859c390f finding unmoderated comments 2010-07-14 14:23:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE 4069bf2bf3 2010-07-14 10:42:39 +00:00
Joey Hess fd8bcb32ea add missing getsetup hook 2010-07-13 15:23:44 -04:00
Joey Hess 40b03990e0 merged 2010-07-12 15:43:04 -04:00
Joey Hess c6ef898851 changelog 2010-07-12 15:42:30 -04:00
intrigeri 718d9413fb po: added an optional target percentage to needstranslation
(cherry picked from commit 98cc9460ac)
2010-07-12 15:40:39 -04:00
Joey Hess 0eee3fe2a2 merged filter-full 2010-07-12 15:39:32 -04:00
Joey Hess fd2b2f386f Merge branch 'filter-full' 2010-07-12 15:35:40 -04:00
test 911c9b01f1 2010-07-12 19:02:30 +00:00
jeanm 9834b02946 Added a comment 2010-07-12 17:43:31 +00:00
Joey Hess dbb63cb7fd openid: Fix handling of utf-8 nicknames. 2010-07-11 13:38:37 -04:00
Joey Hess 8ce1bea634 response 2010-07-11 13:35:11 -04:00
Joey Hess 8902deced2 response 2010-07-11 13:34:17 -04:00
intrigeri 51ac511369 reply, proposed a few possible solutions. 2010-07-11 12:52:22 +02:00
intrigeri 4449a70214 po: check validity of po_slave_languages array. 2010-07-11 12:28:02 +02:00
intrigeri cfb63bc638 implemented, please merge 2010-07-11 12:00:00 +02:00