Jacques Distler
008824c1ad
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-11 10:22:15 -05:00
Jacques Distler
a483b4e71e
Also fix S5 slides.js
...
It needs to use relative URLs, too.
2009-10-11 10:20:43 -05:00
Jacques Distler
de44b81020
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-11 09:56:55 -05:00
Jacques Distler
23e9c6beb2
Use AssetTagHelpers in S5 Template
...
Otherwise S5 breaks when Instiki is
deployed to a non-root URL (e.g., by
setting RailsBaseURI in Passenger).
Also a stylistic tweak in lib/node.rb
2009-10-11 09:49:01 -05:00
Jacques Distler
fe9e834983
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-10 03:54:33 -05:00
Jacques Distler
dd8c912c6c
Update lib/node.rb
...
Grab some fixes from html_scanner, and add few of our own.
2009-10-10 03:52:33 -05:00
Jacques Distler
ffa6ee23cd
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-10 02:46:59 -05:00
Jacques Distler
d5e35d2861
Some more Sanitizer tweaks
...
Mostly stylistic things, but allow some constants to be defined by the calling program.
2009-10-10 02:44:44 -05:00
Jacques Distler
7995143c09
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-09 23:20:38 -05:00
Jacques Distler
d14db51d9e
More Sanitizer Refactoring
...
Make the Sanitizer more efficient.
Also, update some unit tests.
2009-10-09 23:18:17 -05:00
Jacques Distler
0f1b6bc695
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-09 14:03:57 -05:00
Jacques Distler
9b7071d190
Update Sanitizer Docs
...
They were a bit out-of-sync with what the sanitizer
actually does.
2009-10-09 14:02:07 -05:00
Jacques Distler
043db32754
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-09 13:04:00 -05:00
Jacques Distler
e7b77dd3d3
Sanitizer Refactoring
...
A bit of cleanup for the Sanitizer.
2009-10-09 13:02:02 -05:00
Jacques Distler
5c2e4437b5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-10-08 16:24:59 -05:00
Jacques Distler
2f3ff9f651
Efficiency
...
There's a moderate efficiency gain to be had by
using Set#include?, rather than Array#include?
in the sanitizer.
2009-10-08 16:22:50 -05:00
Jacques Distler
a35921a90d
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-25 16:02:23 -05:00
Jacques Distler
e0df6c8a6a
Updated Tests and Sanitizer Fixes for Revision 439
2009-09-25 15:59:43 -05:00
Jacques Distler
b438bc64f6
Update More MathML Entity Mappings
...
Bring up-to-date with Editor's copy of
XML Entity definitions for Characters
(W3C Working Draft 13 September 2009)
http://www.w3.org/2003/entities/2007doc/overview.html
2009-09-25 14:34:22 -05:00
Jacques Distler
22b119c056
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-24 16:24:04 -05:00
Jacques Distler
31ed55f055
Update MathML Entity Mappings
...
Update list of XHTML+MathML named entities
to match
http://www.w3.org/TR/2008/WD-xml-entity-names-20080721/
2009-09-24 16:21:22 -05:00
Jacques Distler
e652af4e73
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-09 15:03:49 -05:00
Jacques Distler
7185af32fc
Fix an Eyesore
...
That just looked sloppy. I blame copy/paste.
2009-09-09 15:01:25 -05:00
Jacques Distler
f5f3d76c99
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-09 09:18:39 -05:00
Jacques Distler
3ff68ef42f
Don't Expand NCRs
...
That operation is not idempotent (among other defects).
Instead, just check that the NCRs corespond to valid utf-8.
(Reported by Andrew Stacey)
2009-09-09 09:16:00 -05:00
Jacques Distler
2068683ee8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-07 20:44:57 -05:00
Jacques Distler
116255dc0d
Purify Categories
...
Apply the same methodology, as in Revision 432,
to the category chunk-handler. This completes
the replacement of all the code that looks like
if string.is_utf8?
do something
else
complain
end
with code that looks like
string.purify
do something
2009-09-07 20:38:09 -05:00
Jacques Distler
52a0b565a5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-09-07 16:08:33 -05:00
Jacques Distler
c79fef9c01
Clean, rather than Complain
...
Previously, if the user tried to submit content which was
malformed utf-8, Instiki would complain loudly to him.
A slightly more user-friendly approach was suggested by
the latest Rails 2.3.4, and a conversation with Sam Ruby
(who suggested some improvements).
Now, instead of complaining, we remove the offending bytes,
leaving a well-formed utf-8 string, which we pretend is what
the user meant to submit.
2009-09-07 16:02:36 -05:00
Jacques Distler
8957927c7a
That'll Teach Me to Merge Indiscriminately!
...
Rollback rake upgrade task
2009-09-05 23:21:44 -05:00
James Herdman
4d9789644d
Merge from parasew/master
2009-09-05 15:26:29 -04: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
James Herdman
64d305f2a8
Don't make ANY assumptions about the environment. Use the model and
...
Rails to do as much work as possible.
2009-08-29 14:20:08 -04: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
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
191f7b3b2c
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-06-12 19:49:34 -05:00
Jacques Distler
9b857d3501
Test page_name, not text
...
Fix from Jason Blevins.
2009-06-12 19:47:56 -05:00
Jacques Distler
89757dccd4
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-06-11 13:18:37 -05:00
Jacques Distler
c98d44606a
Wikilinks with '." in the Page Name
...
Rails won't let you put "." in the page name.
This prevents creating new-page Wikilinks with
such names.
2009-06-11 13:16:10 -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
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
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