Commit graph

1254 commits

Author SHA1 Message Date
Jacques Distler
8957927c7a That'll Teach Me to Merge Indiscriminately!
Rollback rake upgrade task
2009-09-05 23:21:44 -05:00
Jacques Distler
7f3d0f529b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-09-05 23:09:06 -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
Jacques Distler
e5848d53c3 Ignore this 2009-09-05 22:52:12 -05:00
James Herdman
2c10cff214 Remove superfluous comment 2009-09-05 20:51:31 -04: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
c5beb7d9a1 Make sure we ignore any generated file in webs 2009-09-05 20:43:13 -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
9e988401c5 There's a weird sqlite file generated that is now covered by this test 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
James Herdman
e3752a04dc Ignore everything in webs 2009-09-05 15:26:54 -04:00
James Herdman
4d9789644d Merge from parasew/master 2009-09-05 15:26:29 -04:00
Jacques Distler
63deb51ec1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-09-05 02:45:51 -05:00
Jacques Distler
37a8f30ded Whoops! Make Sure Instiki Works with Vendored Rack 2009-09-05 02:44:19 -05: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
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
ac07bab815 Clean up file permissions 2009-08-29 14:28:13 -04:00
James Herdman
6db6f37439 This shouldn't be under revision control 2009-08-29 14:26:44 -04:00
James Herdman
13fd273f6f Merge branch 'fix_upgrade_rake_task' 2009-08-29 14:25:34 -04:00
James Herdman
bdc8abd11c Introduce rules for Git to ignore certain generated files 2009-08-29 14:25:20 -04: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
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