link to possible solution
https://launchpad.net/~kralph [Fri, 24 Jun 2011 23:42:02 +0000 (23:42 +0000)]
correct typo
Amitai Schlair [Fri, 24 Jun 2011 21:40:35 +0000 (17:40 -0400)]
discussion became unnecessary, and fix formatting
Amitai Schlair [Fri, 24 Jun 2011 21:35:14 +0000 (17:35 -0400)]
Merge OS X advice, and add mine.
http://christian.amsuess.com/chrysn [Fri, 24 Jun 2011 13:43:34 +0000 (13:43 +0000)]
bug observed in this ikiwiki instance in the last two commits
http://smcv.pseudorandom.co.uk/ [Fri, 24 Jun 2011 12:30:56 +0000 (12:30 +0000)]
Yes, we can, but please don't use /index for random tests.
This reverts commit
45304300da4fdc6d103cdb9f83865f4bea520248
http://hmisty.myopenid.com/ [Fri, 24 Jun 2011 11:37:33 +0000 (11:37 +0000)]
Joey Hess [Thu, 23 Jun 2011 21:45:25 +0000 (17:45 -0400)]
Joey Hess [Thu, 23 Jun 2011 21:42:48 +0000 (17:42 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
run.silate@gmail.com
Joey Hess [Thu, 23 Jun 2011 13:41:21 +0000 (09:41 -0400)]
html5 is not experimental anymore. But not the default either, quite yet.
Added a comment
Added a comment: IT WORKS!!! Ikiwiki rules!
http://smcv.pseudorandom.co.uk/ [Thu, 23 Jun 2011 08:10:14 +0000 (08:10 +0000)]
http://smcv.pseudorandom.co.uk/ [Thu, 23 Jun 2011 07:54:06 +0000 (07:54 +0000)]
Added a comment
http://smcv.pseudorandom.co.uk/ [Thu, 23 Jun 2011 07:52:04 +0000 (07:52 +0000)]
Added a comment
http://smcv.pseudorandom.co.uk/ [Thu, 23 Jun 2011 07:48:21 +0000 (07:48 +0000)]
despam
run.silate@gmail.com
run.silate@gmail.com
Joey Hess [Wed, 22 Jun 2011 20:19:28 +0000 (16:19 -0400)]
despam
Joey Hess [Tue, 21 Jun 2011 19:20:57 +0000 (15:20 -0400)]
apply Changaco's patch to make headinganchors more like mediawiki's
Joey Hess [Tue, 21 Jun 2011 19:13:49 +0000 (15:13 -0400)]
add websetup hook
Joey Hess [Tue, 21 Jun 2011 19:12:02 +0000 (15:12 -0400)]
move headinganchors out of contrib
Joey Hess [Fri, 17 Jun 2011 23:02:38 +0000 (19:02 -0400)]
a few more jquery icons
Bug: Markdown-garbled mailto:-links still absolutised in Atom and RSS
http://kerravonsen.dreamwidth.org/ [Mon, 20 Jun 2011 03:24:49 +0000 (03:24 +0000)]
Added a comment
http://joey.kitenet.net/ [Mon, 20 Jun 2011 00:22:54 +0000 (00:22 +0000)]
Added a comment
http://kerravonsen.dreamwidth.org/ [Mon, 20 Jun 2011 00:13:05 +0000 (00:13 +0000)]
help me, plugin experts
http://oneingray.myopenid.com/ [Sat, 18 Jun 2011 10:41:48 +0000 (10:41 +0000)]
Fixed ‘ispell-local-dictionary’ in the ‘Local variables:’ section (was: ‘ispell-dictionary’.)
http://oneingray.myopenid.com/ [Sat, 18 Jun 2011 10:39:51 +0000 (10:39 +0000)]
Linked ‘nets.asu591.ru/networks-2011/’, too.
Joey Hess [Fri, 17 Jun 2011 19:17:20 +0000 (15:17 -0400)]
improve detection of ajax request
Firefox sent an accept header for application/xml, not application/json,
and also weakened the priority to 0.8. So that stuff is not to be trusted;
instead I found a better way: When an ajax upload is *not* being made,
the Upload Attachment button will be used, so enable ajax if an upload
is being made without that button having been used.
Also, testing with firefox revealed it refused to process a response that
was type application/json, and checking the demo page for the jquery file
upload plugin, it actually returns the json with type text/html. Ugh.
Followed suite.
Now tested with: chromium, chromium (w/o js), firefox, firefox (w/o js),
and w3m.
Joey Hess [Thu, 16 Jun 2011 18:32:56 +0000 (14:32 -0400)]
add JSON dep
Joey Hess [Thu, 16 Jun 2011 17:13:08 +0000 (13:13 -0400)]
Add libtext-multimarkdown-perl to Suggests. Closes: #630705
Joey Hess [Thu, 16 Jun 2011 17:05:05 +0000 (13:05 -0400)]
Merge branch 'tova'
Joey Hess [Thu, 16 Jun 2011 17:01:23 +0000 (13:01 -0400)]
show ikiwiki error when attachment is rejected
http://jmtd.livejournal.com/ [Thu, 16 Jun 2011 08:43:55 +0000 (08:43 +0000)]
http://jmtd.livejournal.com/ [Thu, 16 Jun 2011 08:43:00 +0000 (08:43 +0000)]
weird
http://jmtd.livejournal.com/ [Thu, 16 Jun 2011 08:38:23 +0000 (08:38 +0000)]
rename bugs/emails_should_not_be_considered_as_bronen_links.mdwn to bugs/emails_should_not_be_considered_as_broken_links.mdwn
Joey Hess [Thu, 16 Jun 2011 00:12:16 +0000 (20:12 -0400)]
move images around
jquery-ui expects to find them in a specific place relative to it
Joey Hess [Thu, 16 Jun 2011 00:04:27 +0000 (20:04 -0400)]
jquery-ui icons
Joey Hess [Thu, 16 Jun 2011 00:02:14 +0000 (20:02 -0400)]
let thru HTTP_ACCEPT
Needed for attachment to return json when requested.
I think some browsers send Accept: * , so I made sure to check that json
was explicitly listed as to be accepted, as well as having a high
priority.
Joey Hess [Wed, 15 Jun 2011 23:48:49 +0000 (19:48 -0400)]
bugfixes
Make sure staged attachments sort as earlier, even if they're not really.
Joey Hess [Wed, 15 Jun 2011 23:48:33 +0000 (19:48 -0400)]
move image
Joey Hess [Wed, 15 Jun 2011 23:33:22 +0000 (19:33 -0400)]
added jquery templates
Joey Hess [Wed, 15 Jun 2011 23:31:11 +0000 (19:31 -0400)]
typo
Joey Hess [Wed, 15 Jun 2011 23:30:34 +0000 (19:30 -0400)]
added jquery-ui for attachment interface
Joey Hess [Wed, 15 Jun 2011 23:16:08 +0000 (19:16 -0400)]
use jquery underlay
Joey Hess [Wed, 15 Jun 2011 23:15:06 +0000 (19:15 -0400)]
updated jquery and made it its own underlay
Joey Hess [Wed, 15 Jun 2011 23:08:40 +0000 (19:08 -0400)]
load attachment javascript into template the clean way
Joey Hess [Wed, 15 Jun 2011 22:56:36 +0000 (18:56 -0400)]
update copyright
Joey Hess [Wed, 15 Jun 2011 22:45:32 +0000 (18:45 -0400)]
deleted a lot of code ikiwiki does not need
removed most of the css, going for standard plain ikiwiki look
Removed support for image previews, file size limits, delete buttons,
maximum number of files, file size display. Ikiwiki handles all that.
Turned on autoupload.
Joey Hess [Wed, 15 Jun 2011 22:41:50 +0000 (18:41 -0400)]
add the blueimp jquery fileupload widget
from http://aquantum-demo.appspot.com/file-upload
git version
7f89121
removed some files ikiwiki does not need
Joey Hess [Wed, 15 Jun 2011 22:37:12 +0000 (18:37 -0400)]
WIP
Joey Hess [Wed, 15 Jun 2011 21:46:08 +0000 (17:46 -0400)]
fix removal of staged attachments
Joey Hess [Wed, 15 Jun 2011 19:21:59 +0000 (15:21 -0400)]
WIP
privat [Wed, 15 Jun 2011 15:16:35 +0000 (15:16 +0000)]
New bug report
http://smcv.pseudorandom.co.uk/ [Wed, 15 Jun 2011 14:14:34 +0000 (14:14 +0000)]
removed
privat [Wed, 15 Jun 2011 13:23:25 +0000 (13:23 +0000)]
New bug report
privat [Wed, 15 Jun 2011 13:22:08 +0000 (13:22 +0000)]
semi-solved it seems
privat [Wed, 15 Jun 2011 12:56:40 +0000 (12:56 +0000)]
new bug report
privat [Wed, 15 Jun 2011 12:49:11 +0000 (12:49 +0000)]
removed
privat [Wed, 15 Jun 2011 12:48:44 +0000 (12:48 +0000)]
Test of a subpage of sandbox
Joey Hess [Tue, 14 Jun 2011 20:28:09 +0000 (16:28 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Tue, 14 Jun 2011 20:02:09 +0000 (16:02 -0400)]
implement renaming of held attachments
This is somewhat suboptimal, it does not update links to the renamed file,
or show a result message.
Joey Hess [Tue, 14 Jun 2011 19:47:47 +0000 (15:47 -0400)]
remove trailing slash from attachment_holding_dir
If it's passed a filename, it should return the filename inside the holding
dir. If passed a page, the directory sans slash. All code adds the slash.
Joey Hess [Tue, 14 Jun 2011 19:30:19 +0000 (15:30 -0400)]
more generic interface
Joey Hess [Tue, 14 Jun 2011 19:19:23 +0000 (15:19 -0400)]
bugfixes
Joey Hess [Tue, 14 Jun 2011 19:07:34 +0000 (15:07 -0400)]
bugfix for attachments of non-index pages
Joey Hess [Tue, 14 Jun 2011 18:44:20 +0000 (14:44 -0400)]
fix removal of helf attachments
Left out confirmation of removal for held attachments because
a) they're not in the wiki yet, so confirmation is a bit unnecessary
b) it would be hard
c) eases later integration of jquery file upload interface
Also changed where attachments of index are held (to match where they're
stored in the srcdir).
Note that the attachment formbuilder hook was made to run last, so that
the list of attachments is not generated before removal, in the fast path
w/o confirm.
Joey Hess [Tue, 14 Jun 2011 18:08:13 +0000 (14:08 -0400)]
fixed previewing of attachments from holding area
Joey Hess [Tue, 14 Jun 2011 17:59:11 +0000 (13:59 -0400)]
fixed saving attachments on page save
Also saved on preview, but previewing is a bit broken, does not see the
newly saved attachment yet.
Joey Hess [Tue, 14 Jun 2011 17:49:41 +0000 (13:49 -0400)]
attachment list includes new attachments in holding area
Note that it's possible for an attachment in the holding area to be older
than an attachemnt in the wiki with the same name. I intentionally
show the one in the holding area in this (unlikely) case, since saving the
page will overwrite the wiki's file with the held attachment. It does not
seem worth the bother of doing something more intelligent, since in this
case two people have basically conflicted with one-another.. and both
attachment contents will be stored in revision control in case it needs to
be sorted out.
I had to remove the hyperlink for attachments in the holding area, since
they're not yet live on the web. This could be annoying/confusing. Added
a moseover notice instead.
Joey Hess [Tue, 14 Jun 2011 17:41:07 +0000 (13:41 -0400)]
untaint and linkpage the page name used in attachment holding directory
Joey Hess [Tue, 14 Jun 2011 17:38:37 +0000 (13:38 -0400)]
store filename in holding dir in linkpage form
Avoids any unpleasantness with .. or other special chars in the attachment
filename.
Joey Hess [Tue, 14 Jun 2011 17:30:09 +0000 (13:30 -0400)]
store attachments in holding area; commit to wiki on page save
This makes uploading a lot of attachments somewhat faster, because
the user does not need to wait for a long website refresh after each
upload. Still probably somewhat slow, since ikiwiki has to run for each
upload.
More importantly, this opens the door for integration of things like
the jquery file upload interface, which allow drag-n-drop and multiple
file uploads to be queued and then ran.
It uses rcs_commit_staged, which leaves out tla and mercurual which lack
that, but since rename, remove, autoindex, etc also use that, I think it's
fine for attachments to also depend on it.
The attachment list is currently broken; it does not look in the holding
area yet, and its links to the attached files won't work since they're not
yet in the wiki. previewing is also currently broken.
Work sponsored by TOVA.
Joey Hess [Tue, 14 Jun 2011 17:06:59 +0000 (13:06 -0400)]
refactor
http://jmtd.livejournal.com/ [Tue, 14 Jun 2011 11:04:28 +0000 (11:04 +0000)]
s/as-is/as pre-formatted/
finding, the one morth
doings
findings
Joey Hess [Mon, 13 Jun 2011 16:50:26 +0000 (12:50 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 13 Jun 2011 16:20:21 +0000 (12:20 -0400)]
improve usage message
http://cdombroski.myopenid.com/ [Mon, 13 Jun 2011 15:47:24 +0000 (15:47 +0000)]
we can see the fnords
This reverts commit
950d6ce453d05f1499deb25c1294cf5abaabbc1c