aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* improve detection of ajax requestJoey Hess2011-06-17
| | | | | | | | | | | | | | | | 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.
* add JSON depJoey Hess2011-06-16
|
* (no commit message)https://www.google.com/accounts/o8/id?id=AItOawltWJYngc-Wn4VeHD1g-9aGkqf2LWSGlZA2011-06-16
|
* Add libtext-multimarkdown-perl to Suggests. Closes: #630705Joey Hess2011-06-16
|
* Merge branch 'tova'Joey Hess2011-06-16
|\
| * show ikiwiki error when attachment is rejectedJoey Hess2011-06-16
| |
| * move images aroundJoey Hess2011-06-15
| | | | | | | | jquery-ui expects to find them in a specific place relative to it
| * jquery-ui iconsJoey Hess2011-06-15
| |
| * let thru HTTP_ACCEPTJoey Hess2011-06-15
| | | | | | | | | | | | | | | | 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.
| * bugfixesJoey Hess2011-06-15
| | | | | | | | Make sure staged attachments sort as earlier, even if they're not really.
| * move imageJoey Hess2011-06-15
| |
| * added jquery templatesJoey Hess2011-06-15
| |
| * typoJoey Hess2011-06-15
| |
| * added jquery-ui for attachment interfaceJoey Hess2011-06-15
| |
| * use jquery underlayJoey Hess2011-06-15
| |
| * updated jquery and made it its own underlayJoey Hess2011-06-15
| |
| * load attachment javascript into template the clean wayJoey Hess2011-06-15
| |
| * update copyrightJoey Hess2011-06-15
| |
| * deleted a lot of code ikiwiki does not needJoey Hess2011-06-15
| | | | | | | | | | | | | | | | | | 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.
| * add the blueimp jquery fileupload widgetJoey Hess2011-06-15
| | | | | | | | | | | | | | from http://aquantum-demo.appspot.com/file-upload git version 7f89121 removed some files ikiwiki does not need
| * WIPJoey Hess2011-06-15
| |
| * fix removal of staged attachmentsJoey Hess2011-06-15
| |
| * WIPJoey Hess2011-06-15
| |
| * implement renaming of held attachmentsJoey Hess2011-06-14
| | | | | | | | | | This is somewhat suboptimal, it does not update links to the renamed file, or show a result message.
| * remove trailing slash from attachment_holding_dirJoey Hess2011-06-14
| | | | | | | | | | 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.
| * more generic interfaceJoey Hess2011-06-14
| |
| * bugfixesJoey Hess2011-06-14
| |
| * bugfix for attachments of non-index pagesJoey Hess2011-06-14
| |
| * fix removal of helf attachmentsJoey Hess2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * fixed previewing of attachments from holding areaJoey Hess2011-06-14
| |
| * fixed saving attachments on page saveJoey Hess2011-06-14
| | | | | | | | | | Also saved on preview, but previewing is a bit broken, does not see the newly saved attachment yet.
| * attachment list includes new attachments in holding areaJoey Hess2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * untaint and linkpage the page name used in attachment holding directoryJoey Hess2011-06-14
| |
| * store filename in holding dir in linkpage formJoey Hess2011-06-14
| | | | | | | | | | Avoids any unpleasantness with .. or other special chars in the attachment filename.
| * store attachments in holding area; commit to wiki on page saveJoey Hess2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * refactorJoey Hess2011-06-14
| |
* | (no commit message)http://jmtd.livejournal.com/2011-06-16
| |
* | weirdhttp://jmtd.livejournal.com/2011-06-16
| |
* | rename bugs/emails_should_not_be_considered_as_bronen_links.mdwn to ↵http://jmtd.livejournal.com/2011-06-16
| | | | | | | | bugs/emails_should_not_be_considered_as_broken_links.mdwn
* | (no commit message)https://www.google.com/accounts/o8/id?id=AItOawmNzbFI-h8pasnveHkW_Y56pB7-KUqwnys2011-06-16
| |
* | New bug reportprivat2011-06-15
| |
* | removedhttp://smcv.pseudorandom.co.uk/2011-06-15
| |
* | New bug reportprivat2011-06-15
| |
* | semi-solved it seemsprivat2011-06-15
| |
* | new bug reportprivat2011-06-15
| |
* | removedprivat2011-06-15
| |
* | Test of a subpage of sandboxprivat2011-06-15
| |
* | (no commit message)https://www.google.com/accounts/o8/id?id=AItOawkYJcmOv1Z1i9HjFcBuW340oJdGjvo5adc2011-06-15
| |
* | (no commit message)https://www.google.com/accounts/o8/id?id=AItOawkYJcmOv1Z1i9HjFcBuW340oJdGjvo5adc2011-06-15
| |
* | Merge branch 'master' of ssh://git.ikiwiki.infoJoey Hess2011-06-14
|\ \ | |/ |/|