Commit graph

340 commits

Author SHA1 Message Date
Jacques Distler 5634f93afc Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-04 03:47:21 -05:00
Jacques Distler 41274d64d0 Support itex2MML 1.3.12 2009-10-04 03:46:06 -05:00
Jacques Distler e489d77579 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-09-13 11:27:01 -05:00
Jacques Distler affc47fc22 Fix TeX Rendering Bug
Make sure we

  require 'maruku/ext/math'

before calling the Maruku#to_latex method.

Also, update test for itex2MML 1.3.11 .
2009-09-13 11:23:57 -05:00
Jacques Distler 03abccc45a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-09-08 22:24:12 -05:00
Jacques Distler d51b04d3db Update Location of Textile Help
_why_the_lucky_stiff disappeared . Use a
mirror site instead. (Reported by villem)
2009-09-08 22:20:18 -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 f029aae60e Refactoring the Web Model (From James Herdman)
A bit of refactoring, via 

  http://github.com/jherdman/instiki/tree/master
2009-09-05 23:02:52 -05:00
James Herdman 5a29810abc Document many obvious methods on Web 2009-09-05 20:47:48 -04:00
James Herdman 33bbf31333 Use the 'pages' association in Web#add_page 2009-09-05 20:43:14 -04:00
James Herdman 3f265a520b Document Web#default_web? 2009-09-05 20:43:13 -04:00
James Herdman 7a7d187c7f Refactor methods that touch the 'wiki_files' association on Web 2009-09-05 20:43:13 -04:00
James Herdman bea8525130 Fully leverage the #wiki_files association on Web 2009-09-05 20:43:13 -04:00
James Herdman 8c1ded2303 More succinct Web#has_page? method 2009-09-05 20:43:13 -04:00
James Herdman af61e78b96 More succinct Web#last_page method, and documentation 2009-09-05 20:43:13 -04:00
James Herdman b52dee63c3 More succinct Web#page method and documentation 2009-09-05 20:43:13 -04:00
James Herdman 09531ce777 Moved validators and hooks to the top of Web to promote their visibility
visibility
2009-09-05 20:43:12 -04:00
James Herdman 23dae8b155 Clean up Web#page_names_by_author implemention 2009-09-05 20:43:12 -04:00
James Herdman 6a4af8a59a More succinct Web#markup method, now with documentation 2009-09-05 20:43:12 -04:00
James Herdman b96810fd2e Refactor Web#authors and document it using Yard-style markup 2009-09-05 20:43:12 -04:00
James Herdman c0cab0d0b7 Introduce 'revisions' association on Web 2009-09-05 20:43:12 -04:00
James Herdman ed8e9cfbd8 White space police 2009-09-05 20:43:12 -04:00
Jacques Distler 9be02c92e5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-09-05 02:07:44 -05:00
Jacques Distler 4bdf703ab2 Instiki 0.17.2: Security Release
This release upgrades Instiki to Rails 2.3.4, which
patches two security holes in Rails. See

  http://weblog.rubyonrails.org/2009/9/4/ruby-on-rails-2-3-4

There are also some new features, and the usual boatload
of bugfixes. See the CHANGELOG for details.
2009-09-05 02:01:46 -05:00
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 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 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 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 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