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

385 commits

Author SHA1 Message Date
Jacques Distler
fe877a10b4 Make html_ext Available as a Helper 
... and protected.
 2009-12-16 00:59:33 -06:00
Jacques Distler
cf37421f4b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-14 22:37:37 -06:00
Jacques Distler
f3b69bc57b Make xhtml_enabled? a Protected Method 
... as it should be. Remarkably, it's
still possible to use it in views, if
you declare it a helper method.
 2009-12-14 22:34:31 -06:00
Jacques Distler
47941683ab Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-14 17:43:53 -06:00
Jacques Distler
d3e79ea84a Make truncate() Unicode-aware 2009-12-14 17:41:28 -06:00
Jacques Distler
085783d308 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-14 02:07:56 -06:00
Jacques Distler
2c5e5a0015 Refactoring 
Move the truncate() method into ApplicationHelper.
Move another method around, for no particularly
good reason. Controllers really shouldn't have
public methods that don't correspond to actions.
 2009-12-14 02:01:50 -06:00
Jacques Distler
5899e19611 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-13 21:16:26 -06:00
Jacques Distler
dc3d202665 Cache Source View 
Also, fix a cache-sweeping bug reported,
long ago, by Toby Bartels.
 2009-12-13 21:09:12 -06:00
Jacques Distler
a02ada047a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-13 20:02:24 -06:00
Jacques Distler
1613973929 Array#collect is faster than Array#inject 
Also add some more tests.
 2009-12-13 20:00:18 -06:00
Jacques Distler
0b1fccc178 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-13 19:29:02 -06:00
Jacques Distler
282515d907 Source View 
Add a Source view. [Based on a suggestion by Andrew Stacey]
Fix a well-formedness bug in the list action, due to
boneheaded truncation algorithm. [Reported by Roby Bartels]
 2009-12-13 19:25:14 -06:00
Jacques Distler
5090d1f167 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-07 15:31:28 -06:00
Jacques Distler
2c5c6dc78a S5 Fix 
Omit a (seemingly superfluous)
javascript hack which causes
Gecko-based browsers to request
   /my_wiki/s5/null
when they load an s5 slideshow.

Also a stylistic cleanup in
the wiki_controller.
 2009-12-07 15:27:40 -06:00
Jacques Distler
0bc05f11fd Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-02 12:47:53 -06:00
Jacques Distler
f7044ecbb4 Ruby 1.9.1 Fixes 
Some more fixes to deal with Ruby 1.9.1.
 2009-12-02 12:46:15 -06:00
Jacques Distler
1376a01574 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-01 12:07:16 -06:00
Jacques Distler
34b63a8375 Fix a Ruby 1.9 Character Encoding Bug 
Wow, this stuff is complicated!
Some things really want to be UTF-8;
others really want to be byte strings.
 2009-12-01 12:03:15 -06:00
Jacques Distler
1cf29f444f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-11-22 01:34:50 -06:00
Jacques Distler
79c8572053 Use Rails.root 
A little cleanup.
 2009-11-22 01:32:58 -06:00
Jacques Distler
13c8990c80 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-11-22 00:33:18 -06:00
Jacques Distler
045dcbf1f5 Media Type 
The default stylesheet should be media='all',
rather than media='screen'.
Damned Rails defaults!
 2009-11-22 00:27:42 -06:00
Jacques Distler
77dcb015f3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-11-09 18:19:12 -06:00
Jacques Distler
e678b7e3a2 Spacing Tweak 2009-11-09 18:17:57 -06:00
Jacques Distler
7189863225 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-11-09 12:01:20 -06:00
Jacques Distler
2b213d95de Accessiblity: Skip Navigation Link 
Thanks to John Gardner for the suggestion.
 2009-11-09 11:58:57 -06:00
Jacques Distler
9015cfcfc0 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-11-06 21:26:01 -06:00
Jacques Distler
2e52ce48df Update LaTeX Output for Revision 464 2009-11-06 21:23:18 -06:00
Jacques Distler
88cb82769a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-11-06 14:37:40 -06:00
Jacques Distler
977da29f68 Support for \tooltip{}{} and \statusline{}{} 
itex2MML 1.3.16 add a \tooltip{}{} command which,
like \statusline{}{}, produces an <maction> element.

Neither of these is natively supported by Mozilla/Firefox.
Add some Javascript to work around that weakness.
 2009-11-06 14:32:45 -06:00
Jacques Distler
4176ef2bcf Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-23 11:14:41 -05:00
Jacques Distler
883d82992c Version 0.17.3 2009-10-23 11:13:26 -05:00
Jacques Distler
097ce16e8b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-19 22:59:29 -05:00
Jacques Distler
5df1504255 Tests for Revision 456 
Functional tests for Revision 456.
Also, fix a buglet in handling rescues
for new pages.
 2009-10-19 22:57:11 -05:00
Jacques Distler
6e8c25d96a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-19 18:26:34 -05:00
Jacques Distler
20c99df440 Work around Rails flash bug 
When redirected to another page, flash 
messages will not display if the query
string is longer than 10192 bytes. In
Instiki, certain rescue operations 
involve redirection, with the updated
content of the page passed as a query
parameter. Fall back to using the stored
content (ie, don't pass a query parameter)
if the content is too long.
 2009-10-19 18:19:31 -05:00
Jacques Distler
4de9fb9283 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-11 14:02:44 -05:00
Jacques Distler
cae4b5c539 Enable X-Sendfile support under Passenger 
Passenger doesn't behave like a proxy server.
But it does support X-Sendfile. So let's make
use of that.
 2009-10-11 14:00:16 -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
59dba2105c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-06 11:32:27 -05:00
Jacques Distler
aef669a923 Change some CRs to LFs 2009-10-06 11:31:15 -05:00
Jacques Distler
0d210fe10f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-10-05 02:40:11 -05:00
Jacques Distler
d89769fe81 Update for itex2MML 1.3.13 
Implements \mathrlap{}, \mathllap{}, and \mathclap{}.
Deprecates the use of \rlap{} (use \mathrlap{}, instead:
the latter works in math-mode in the LaTeX export, whereas
TeX's \rlap{} did not).
 2009-10-05 02:36:00 -05:00
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