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

304 commits

Author SHA1 Message Date
Jacques Distler 329fafafce Fix Two bugs from Toby Bartels 
1. Ensure that "rollback" respects locked pages.
2. Expire revisions of an edited page. Use a before_save
   hook to deal with the situation where a page's name
   has been changed.
 2009-08-04 00:02:04 -05:00
Jacques Distler 9edb8f6045 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-07-27 22:53:11 -05:00
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
Jacques Distler 98918954e0 Cache Sweeping 
Expire cached revisions of deleted pages.
Tweak the appearance of "history" page a bit.
 2009-03-31 23:37:21 -05:00
Jacques Distler 62fd333e71 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-31 16:23:11 -05:00
Jacques Distler 69bfc1028b Cache Revisions 
Fix config/routes.rb to make revisions cacheable.
Cache revisions.
Modify the history page so that it links to the current page (and diff).
 2009-03-31 15:54:41 -05:00
Jacques Distler db534ec840 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-31 08:54:52 -05:00
Jacques Distler 73a7ceef03 Cache History Pages 
Implement caching for the "history" pages
introduced in Revision 377.
 2009-03-31 08:52:46 -05:00
Jacques Distler 6b09f76864 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-30 23:55:20 -05:00
Jacques Distler d5a65e6ac8 History Pages 
From Jason Blevins:
  Create a "History" page for each wiki page.
  Link to it, and to the "Diff" page from "Recently Revised".
Also, correct a bug in listing/deleting links to uploaded
video and audio files.
 2009-03-30 23:50:06 -05:00
Jacques Distler c351689469 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-29 21:25:56 -05:00
Jacques Distler 7c0874bf4c Colour Schemes 
From Jason Blevins:
Added blue, brown, scarlet red, and plum color options.
 2009-03-29 21:24:27 -05:00
Jacques Distler 771ef0eefe Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-24 22:43:36 -05:00
Jacques Distler c85ce458ce Update for itex2MML 1.38 
Add support, in the LaTeX export, for blackboard bold
digits and lowercase latin letters. If these are
present, LaTeX will
   \usepackage{mathbbol}
N.B.: this uses the stmaryrd font for blackboard bold
letters, instead of the msbm font.
Tests included. (Yes, you need to update itex2MML as well.)
 2009-03-24 22:37:58 -05:00
Jacques Distler af22bc67e6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-16 09:57:44 -05:00
Jacques Distler e2ccdfd812 Instiki 0.16.5 
Update to Rails 2.3.2 (the stable Rails 2.3 release).
Add audio/speex support
Update CHANGELOG
Bump version number
 2009-03-16 09:55:30 -05:00
Jacques Distler 58073d8302 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-07 20:50:41 -06:00
Jacques Distler 9f2cb8bbe5 Update LaTeX output for itex2MML 1.3.7 2009-03-07 20:49:14 -06:00
Jacques Distler 448e843192 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-05 21:44:55 -06:00
Jacques Distler 6c0decc4ea Railsisms 
Use some ActiveRecord convenience methods.
 2009-03-05 21:42:41 -06:00
Jacques Distler 50f58779a8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-05 12:18:40 -06:00
Jacques Distler 13d096c688 Set X-Sendfile Header Only for Local Proxy Requests 
If the request.remote_addr is not LOCALHOST, don't set the
X-Sendfile header.
 2009-03-05 12:14:03 -06:00
Jacques Distler cdc7b8debf Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-04 15:56:36 -06:00
Jacques Distler bd9fa0ed0c Bump Version Number 
Update CHANGELOG and bump version number to 0.16.4.
 2009-03-04 15:54:30 -06:00
Jacques Distler 3fdfad29a3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-03 12:19:13 -06:00
Jacques Distler c7418af48d Support for HTML5 <audio> 
As with <video>,

   [[foo.wav:audio]]

works now, producing an HTML5 <audio> element.
 2009-03-03 12:17:14 -06:00
Jacques Distler 52f57f151c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-03-02 02:39:23 -06:00
Jacques Distler 8ea8b6a8f7 <video> and x-sendfile 
Using <object> and <embed> were forbidden for obvious
security reasons. Instiki now permits embedding video
via the HTML5 <video> element (Ogg/Theora encoded videos
only, with .ogg or .ogv extensions). You can even upload
videos with

    [[foo.ogg:video]]

Instiki now support x-sendfile. See the Proxying page for
configuring Apache (with the x-sendfile module). Lighttpd
should work similarly.

Update Rails to latest Edge (hopefully converging on RC2!).
 2009-03-02 02:32:25 -06:00
Jacques Distler 186079a0e9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-18 01:43:49 -06:00
Jacques Distler 7f2b16e78d File Upload Fixes 
Dunno why this was buggered again. ":back" doesn't seem to function as it used to.
Also, when uploading a file from page "foo", it's important to return to "foo" after
a successful upload, rather than redirecting to the HomePage.

Finally, a favicon tweak.
 2009-02-18 01:40:11 -06:00
Jacques Distler 3f239a564d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-13 17:24:49 -06:00
Jacques Distler d7c445178b Favicon 
Add a favicon for Instiki.
Also, add an id for the svg path (which makes it reusable).
 2009-02-13 17:22:58 -06:00
Jacques Distler 8c1cf4bfa4 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-11 01:42:08 -06:00
Jacques Distler 8802d90690 XHTML Validity 
Use a SPAN instead of a DIV in the logo. H1 allows only inline content.
 2009-02-11 01:39:53 -06:00
Jacques Distler 123fd29d16 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-09 22:25:53 -06:00
Jacques Distler 53751a61f0 Fix Maruku Hanging Bug 
A Maruku-syntax <div> with an unclosed IAL (and, it seems, at least one equation)
would cause Instiki to hang. Badly. Requiring a 'kill -9' to terminate it.
Reverting the OpenDiv and CloseDiv Regexps to my, more simple-minded, versions
fixes the problem.
 2009-02-09 22:20:34 -06:00
Jacques Distler 84d831f7c2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-08 19:38:42 -06:00
Jacques Distler dcab2f870e Smoother 
Adobe Illustrator's path optimizer produces much smoother
results than Sam's program (and it's WYSIWYG).
 2009-02-08 19:36:44 -06:00
Jacques Distler 2878049b2d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-08 10:29:25 -06:00
Jacques Distler 1ad8885974 Optimize SVG 
Thanks to Sam Ruby, SVG logo is half the size it was before.
Also, use the "wrapper div" trick to make the logo work in
older browsers.
 2009-02-08 10:27:08 -06:00
Jacques Distler 7e7442a085 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-08 03:47:48 -06:00
Jacques Distler 8a60e741d7 Only Display the Logo in XHTML-capable Text-Filters 
Textile and RDoc users can't see the SVG anyway, so don't
bother rendering it.
 2009-02-08 03:45:38 -06:00
Jacques Distler 39341cea0d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-02-08 03:18:40 -06:00
Jacques Distler 6b49228aad Logo for Instiki 
Added an SVG logo for Instiki.
 2009-02-08 03:17:20 -06:00
Jacques Distler 5b258daef9 Added empty directories because Git is stupid. 2009-02-05 03:02:31 -06:00
Jacques Distler 4e14ccc74d Instiki 0.16.3: Rails 2.3.0 
Instiki now runs on the Rails 2.3.0 Candidate Release.
Among other improvements, this means that it now 
automagically selects between WEBrick and Mongrel.

Just run

    ./instiki --daemon
 2009-02-04 14:26:08 -06:00
Jacques Distler 1cdf0536c1 Fix BlahTeX/PNG 
The BlahTeX/PNG code was busted by Revision 344.
Fixed now.
Ari better supply me with a test suite, so this doesn't happen again.
 2009-01-27 11:35:05 -06:00
Jacques Distler 34fd7b425f Webs that Don't Allow File Uploads 
... should still allow you to manually upload files
and have them render.

Fixed.
 2009-01-26 01:39:04 -06:00
Jacques Distler 5d15e3f39d Security: Instiki 0.16.2 
On Webs with file uploads enabled, uploaded files were stored
(in version 0.16.1 and earlier) in the public/ directory.

This was a security threat. A miscreant could upload a .html file.
When a user clicked on the link to the file, it was opened (unsanitized)
in the browser.

As of version 0.16.2, uploaded files are stored in the webs/
directory. Now, when the user clicks on the link, the file is sent
with the

    Content-Disposition: attachment

header set, which causes the file to be downloaded, rather than opened
in the browser. As always, files downloaded from the internets should be
treated with caution. At least, this way, they are not aoutomatically 
opened in the browser.

To move your existing uploaded files to the new location, do a

     rake upgrade_instiki
 2009-01-26 00:21:30 -06:00
Jacques Distler 0b2a6935a2 Export XHTML Pages 
When a Web uses one of the Markdown Text Filters, and you export
all the pages as a zip file, you'd like the MathML and SVG to
render when the pages are viewed locally. This means saving them
with a .xhtml extension. Users of non-XHTML-capable browsers or
Textile users should still get .html files.
 2009-01-23 11:02:16 -06:00
Jacques Distler 4936bea13f Boneheaded 
Remove some nonexistent callbacks, added in Revisions 265, 288.
 2009-01-11 13:49:58 -06:00