Jacques Distler
de97daa048
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-04 00:11:48 -05:00
Jacques Distler
34c4306867
More ActiveRecord Association .length -> .size Optimizations
2009-09-04 00:09:39 -05:00
Jacques Distler
f9a0c824ca
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-03 23:12:27 -05:00
Jacques Distler
342298ed0e
Wikilinks to Published Webs
...
Should be to the published action. This
didn't work right for inter-web links.
(Reported by Mike Shulman)
Also, change some .length's to .size's
(for Andrew Stacey)
2009-09-03 23:09:10 -05:00
Jacques Distler
e75a0f9881
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-29 23:38:08 -05:00
Jacques Distler
888e93a7fd
Streamline Rake Task
...
Refactor the upgrade_instiki rake task.
Based on the (very nice) JHerdman's
64d305f2a8
but defaults to 'production' environment, instead.
Instiki users don't know about production/development/test.
Instiki defaults to 'production'. So should its associated rake tasks.
2009-08-29 23:31:39 -05:00
Jacques Distler
23890d6ec0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-28 11:15:37 -05:00
Jacques Distler
336e57d6b4
Pathname Objects
...
Web#files_path and Web#blatex_pngs_path now return Pathname objects.
Based on JHerdman's
5d1e8f420b
but requires several other changes to the code (which assumed a string).
Also, test for itex2MML 1.3.10 (you should update that too).
2009-08-28 11:10:34 -05:00
Jacques Distler
205fbcb898
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-27 17:01:44 -05:00
Jacques Distler
c05d69bcff
Make upgrade_instiki Rake Task Database-Agnostic
...
Reported by James Herdman.
2009-08-27 16:57:37 -05:00
Jacques Distler
7f8b696dec
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-27 15:31:05 -05:00
Jacques Distler
93ea19f567
Workaround for Mozilla Bug 449396
...
Andrew Stacey reminded me that this bug
https://bugzilla.mozilla.org/show_bug.cgi?id=449396
is still unfixed.
But it's easy to work around...
2009-08-27 15:28:16 -05:00
Jacques Distler
4ce68073c5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-24 17:45:37 -05:00
Jacques Distler
28cf501166
Correctly Set noindex,nofollow On /diff Pages
...
None of them should be indexed.
Make sure that happens.
2009-08-24 17:42:34 -05:00
Jacques Distler
b1117a19c6
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-12 12:22:46 -05:00
Jacques Distler
8cf26c9249
Add a "Create New Page" Link to the Search Page
...
Based on an idea by nowa:
bcac6c9f94
2009-08-12 12:19:23 -05:00
Jacques Distler
c14c1f3c5a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-04 15:45:56 -05:00
Jacques Distler
664552ac02
Rails 2.3.3.1
...
Update to latest Rails.
A little bit of jiggery-pokery is involved, since they
neglected to re-include vendored Rack in this release.
2009-08-04 10:16:03 -05:00
Jacques Distler
96defb0945
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-08-04 00:08:01 -05:00
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
d474cb83ad
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-07-14 00:02:07 -05:00
Jacques Distler
698daecf0e
Maruku "Email" Header Detection
...
The Regexp, used in Maruku to detect "email"
headers (used, e.g., for S5 slideshow metadata)
could, for some inputs, interact badly with
Instiki's Chunk Handler.
Fixed.
2009-07-13 23:59:09 -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
6079fedc16
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-07-09 15:42:14 -05:00
Jacques Distler
77e00f1a76
Test for itex2MML 1.3.9
...
Make sure we have the latest itex2MML.
2009-07-09 15:40:45 -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
4bbc157b2b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-07-06 15:34:16 -05:00
Jacques Distler
ef5878cf11
Put class name on <pre>, rather than <code>
...
Better CSS styling options ensue, if we put
the class='lang' on the <pre> element.
(Suggested by Casper Gripenberg)
2009-07-06 15:30:35 -05:00
Jacques Distler
e2aca9346b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-07-06 11:12:09 -05:00
Jacques Distler
573af987bc
Syntax Colouring
...
Add some default CSS support for syntax colouring of code blocks.
Try:
require 'chunks/chunk'
{:lang=ruby html_use_syntax=true}
or
<div xhtml:class='foo' width='4'>bar<!-- fubar --></div>
{:lang=html html_use_syntax=true}
(Suggested by Casper Gripenberg)
2009-07-06 11:07:57 -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
17d8bbe5e1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-06-15 08:39:14 -05:00
Jacques Distler
591c60de09
Updated CHANGELOG
2009-06-15 08:34:35 -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