Commit Graph

15420 Commits (739c62613151ce58ced6e94af60a85a613fee931)

Author SHA1 Message Date
http://joey.kitenet.net/ 9263af25d7 Added a comment 2011-06-20 00:22:54 +00:00
http://kerravonsen.dreamwidth.org/ 6e4c0d9719 help me, plugin experts 2011-06-20 00:13:05 +00:00
http://oneingray.myopenid.com/ 2bf7d59bb0 Fixed ‘ispell-local-dictionary’ in the ‘Local variables:’ section (was: ‘ispell-dictionary’.) 2011-06-18 10:41:48 +00:00
http://oneingray.myopenid.com/ 59dfdd4bed Linked ‘http://nets.asu591.ru/networks-2011/’, too. 2011-06-18 10:39:51 +00:00
Joey Hess ace3665f81 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.
2011-06-17 15:17:20 -04:00
Joey Hess d82fa99426 add JSON dep 2011-06-16 14:34:44 -04:00
https://www.google.com/accounts/o8/id?id=AItOawltWJYngc-Wn4VeHD1g-9aGkqf2LWSGlZA 3140df5345 2011-06-16 17:21:07 +00:00
Joey Hess d96edbbe68 Add libtext-multimarkdown-perl to Suggests. Closes: #630705 2011-06-16 13:13:08 -04:00
Joey Hess 6d80bdda7c Merge branch 'tova' 2011-06-16 13:05:05 -04:00
Joey Hess 6ebb4e262e show ikiwiki error when attachment is rejected 2011-06-16 13:01:23 -04:00
http://jmtd.livejournal.com/ 107583ff7b 2011-06-16 08:43:55 +00:00
http://jmtd.livejournal.com/ f3b70ec7a7 weird 2011-06-16 08:43:00 +00:00
http://jmtd.livejournal.com/ ea2b089794 rename bugs/emails_should_not_be_considered_as_bronen_links.mdwn to bugs/emails_should_not_be_considered_as_broken_links.mdwn 2011-06-16 08:38:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNzbFI-h8pasnveHkW_Y56pB7-KUqwnys 2e824510b4 2011-06-16 04:52:38 +00:00
Joey Hess 5f0dfdd1ea move images around
jquery-ui expects to find them in a specific place relative to it
2011-06-15 20:12:16 -04:00
Joey Hess 344a2a2582 jquery-ui icons 2011-06-15 20:04:27 -04:00
Joey Hess d4a0732752 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.
2011-06-15 20:02:14 -04:00
Joey Hess 54672a3130 bugfixes
Make sure staged attachments sort as earlier, even if they're not really.
2011-06-15 19:48:49 -04:00
Joey Hess c901e1e80c move image 2011-06-15 19:48:33 -04:00
Joey Hess c9781b20bf added jquery templates 2011-06-15 19:33:22 -04:00
Joey Hess b85485aaa2 typo 2011-06-15 19:31:11 -04:00
Joey Hess f3fd7696cf added jquery-ui for attachment interface 2011-06-15 19:30:34 -04:00
Joey Hess 8363107a9e use jquery underlay 2011-06-15 19:16:08 -04:00
Joey Hess a695b5b2f8 updated jquery and made it its own underlay 2011-06-15 19:15:06 -04:00
Joey Hess e2b43578a6 load attachment javascript into template the clean way 2011-06-15 19:08:40 -04:00
Joey Hess 3a939f05c5 update copyright 2011-06-15 18:56:36 -04:00
Joey Hess f183fed372 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.
2011-06-15 18:45:32 -04:00
Joey Hess 9a4e7b6500 add the blueimp jquery fileupload widget
from http://aquantum-demo.appspot.com/file-upload
git version 7f89121

removed some files ikiwiki does not need
2011-06-15 18:41:50 -04:00
Joey Hess f77452b7ca WIP 2011-06-15 18:37:12 -04:00
Joey Hess 00c0677588 fix removal of staged attachments 2011-06-15 17:46:08 -04:00
Joey Hess b66261d08b WIP 2011-06-15 15:21:59 -04:00
privat 40690fd3a1 New bug report 2011-06-15 15:16:35 +00:00
http://smcv.pseudorandom.co.uk/ fe2876e257 removed 2011-06-15 14:14:34 +00:00
privat 855bc1c1f6 New bug report 2011-06-15 13:23:25 +00:00
privat 456c79f1bd semi-solved it seems 2011-06-15 13:22:08 +00:00
privat fa2f288570 new bug report 2011-06-15 12:56:40 +00:00
privat 860c2c84d9 removed 2011-06-15 12:49:11 +00:00
privat de8a69d931 Test of a subpage of sandbox 2011-06-15 12:48:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYJcmOv1Z1i9HjFcBuW340oJdGjvo5adc 8b7b64986f 2011-06-15 04:06:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYJcmOv1Z1i9HjFcBuW340oJdGjvo5adc 837a9a9cda 2011-06-15 04:05:33 +00:00
Joey Hess c4154e8a45 Merge branch 'master' of ssh://git.ikiwiki.info 2011-06-14 16:28:09 -04:00
Joey Hess 176c7f3ff3 implement renaming of held attachments
This is somewhat suboptimal, it does not update links to the renamed file,
or show a result message.
2011-06-14 16:02:09 -04:00
Joey Hess 2e086b3263 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.
2011-06-14 15:49:33 -04:00
Joey Hess d4254c7f97 more generic interface 2011-06-14 15:31:58 -04:00
Joey Hess 49e7bc2535 bugfixes 2011-06-14 15:19:23 -04:00
Joey Hess a61849e954 bugfix for attachments of non-index pages 2011-06-14 15:07:34 -04:00
Joey Hess 04b2a4d676 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.
2011-06-14 14:44:20 -04:00
Joey Hess c55a32d3e1 fixed previewing of attachments from holding area 2011-06-14 14:08:13 -04:00
Joey Hess d4d2327400 fixed saving attachments on page save
Also saved on preview, but previewing is a bit broken, does not see the
newly saved attachment yet.
2011-06-14 13:59:56 -04:00
Joey Hess e2cb19ed9e 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.
2011-06-14 13:49:41 -04:00