deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1654 commits 3 branches 18 tags 34 MiB
Commit graph

452 commits

Author SHA1 Message Date
Jacques Distler
0e0f666fb4 Rollbacks and Relative URLs 
Ensure "rollback" locks page for editing. (reported by Toby Bartels)
Generate relative URLs, when possible. (Patch by Dennis Knauf)
 2009-07-27 22:49:12 -05:00
Jacques Distler
9b074a93c7 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-07-13 13:01:53 -05:00
Jacques Distler
51280b758d Redirected Pages are not Wanted Pages 
Correct list of Wanted Pages. Should not
include redirected pages.
(Reported by Toby Bartels)
 2009-07-13 12:59:42 -05:00
Jacques Distler
ad087b270a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-07-07 00:15:33 -05:00
Jacques Distler
a0b965c9f5 Tweak CSS for S5 Themes 
So that syntax-colouring will be passably OK there.
 2009-07-07 00:13:48 -05:00
Jacques Distler
717a89d8b4 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-07-02 11:05:10 -05:00
Jacques Distler
7f2e883e12 Slashes in Page Names 
Make it possible to change the name of a page, whose currrent name
contains a forward slash.
(Reported boy Toby Bartels)
 2009-07-02 11:02:05 -05:00
Jacques Distler
73f15777a0 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-21 00:41:35 -05:00
Jacques Distler
a049d27222 Escape Page name 
Use escape_javascript() in page name-changing javascript.
 2009-06-21 00:39:24 -05:00
Jacques Distler
a016729d89 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-17 21:17:34 -05:00
Jacques Distler
2ffa1ea007 Cleanup 
And a fix from Ari Stern.
 2009-06-17 21:12:58 -05:00
Jacques Distler
07fbf17af1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-17 13:03:16 -05:00
Jacques Distler
73120cdc1c Rollback one change from previous commit 
S5 should not be visible on unpublished, password-protected webs.
 2009-06-17 12:45:53 -05:00
Jacques Distler
32c8c4028c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-17 11:31:09 -05:00
Jacques Distler
155dc88891 Uploaded files in published webs should be accessible 
File retrieval (but not file uploads) should be allowed on
a published web (this includes BlahTeX/PNG support).
(Reported by Ari Stern).
 2009-06-17 11:17:25 -05:00
Jacques Distler
335f4669f6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-14 23:18:44 -05:00
Jacques Distler
d135ac3982 Flash[:info] messages use Web's colour scheme 2009-06-14 23:14:24 -05:00
Jacques Distler
b77c1d8db5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-14 23:00:34 -05:00
Jacques Distler
7448b7981b Minor fixes 
1) WEBrick should respond to TERM signals
(needed by MacOSX and, perhaps, others).
2) HTTP redirects for redirected pages should be 301's.
3) Add a flash message for redirection to "new" page
when the target of "show" action is not found.
 2009-06-14 22:55:41 -05:00
Jacques Distler
193d932904 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-14 16:54:42 -05:00
Jacques Distler
d50d6fac17 Get Ready for 0.17 Release 2009-06-14 16:52:59 -05:00
Jacques Distler
9f3d3c8607 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-10 21:11:56 -05:00
Jacques Distler
48ee59e393 Fix a WikiReference Bug 
Wikilinks to redirected pages are valid links.
 2009-06-10 20:49:48 -05:00
Jacques Distler
2995354b3a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-06 21:09:30 -05:00
Jacques Distler
305b37b401 Another Bug-fix and some tests 
Man, but this needs more tests ... !
 2009-06-06 21:08:08 -05:00
Jacques Distler
42a84d8b32 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-06 12:39:44 -05:00
Jacques Distler
12207bc01c Redirect Targets are not Orphaned 
A pages that is linked-to, via a redirect, is not orphaned.
 2009-06-06 12:37:00 -05:00
Jacques Distler
d99503df52 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-05 22:50:23 -05:00
Jacques Distler
63fde3165e Redirected Pages are not Wanted Pages 
... and should not be listed as such on the "list" pages.
 2009-06-05 22:48:32 -05:00
Jacques Distler
2fe01ab0d8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-05 22:27:45 -05:00
Jacques Distler
e341d62809 Close another hole 
I believe this addresses Jason's issue.
 2009-06-05 22:26:25 -05:00
Jacques Distler
09a62be647 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-05 17:48:04 -05:00
Jacques Distler
07da370d41 Battle-hardening 
Fix some bugs in the new redirect/change-name implementation.
Not completely bullet-proof, yet (need to deal with
Jason's issue), but getting there.
 2009-06-05 17:45:57 -05:00
Jacques Distler
27c878a537 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-05 09:04:38 -05:00
Jacques Distler
a2b1c7e66c HTTP Redirects for Redirected Pages 
If a page isn't found, but there is a page that redirects for it,
don't show a 404!
 2009-06-05 09:02:05 -05:00
Jacques Distler
8624a40bf8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-05 00:41:33 -05:00
Jacques Distler
0943b7e510 Expire Caches for Redirected Links 
[[!redirect foo]] should expire all pages which reference "foo".
Sounds simple, but this was a really gnarly bug to fix.
 2009-06-05 00:39:12 -05:00
Jacques Distler
e52ca89aab Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-02 23:37:54 -05:00
Jacques Distler
ea6b04271b Whoops! 
Ruby syntax can be tricky.
 2009-06-02 23:36:39 -05:00
Jacques Distler
3d626dae30 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-06-02 22:24:50 -05:00
Jacques Distler
d7832ba262 Wiki Redirects and Page Renaming 
Added the ability to rename existing pages.
[[!redirects Some Page Name]] redirects Wikilinks [[Some Page Name]] to
  the current page (assuming "Some Page Name" does not exist).
  Real pages trump redirects (though this may change, depending on 
  user feedback).
 2009-06-02 22:17:15 -05:00
Jacques Distler
8cde9dff82 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-05-08 16:16:45 -05:00
Jacques Distler
ec7141942b Instiki 0.16.6 
Fix an incompatiblity between form_spam_protect and IE7.
(Thanks to Jason Blevins)
Roll a new version.
 2009-05-08 16:13:25 -05:00
Jacques Distler
8222c14396 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-04-13 19:09:30 -05:00
Jacques Distler
f062dfe15a Remove some obsolete code from ApplicationController::rescue_action_in_public 
Prompted by
http://rubyforge.org/pipermail/instiki-users/2009-April/001215.html
 2009-04-13 19:06:40 -05:00
Jacques Distler
83e9415c67 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-04-05 11:06:23 -05:00
Jacques Distler
28a0043957 Tweaks to Default Layout 2009-04-05 11:04:44 -05:00
Jacques Distler
60f2864b9e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-04-01 09:22:19 -05:00
Jacques Distler
888ebe4b58 Appearance Tweak 
A couple of tweaks to the appearance of the new history feature.
 2009-04-01 09:20:58 -05:00
Jacques Distler
eebf7ecc6e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-31 23:39:16 -05:00