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

270 commits

Author SHA1 Message Date
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