summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into stablev2.37.1stableSolomon Peachy2012-12-0324-72/+1875
|\
| * [fix] Take care of a few 'Undefined variables'Solomon Peachy2012-12-034-7/+9
| * [misc] Replace '@' with '{at}' to deter spammers.Solomon Peachy2012-11-092-0/+2
| * Merge branch 'master' of git+ssh://git.shaftnet.org/var/lib/git/poSolomon Peachy2012-11-042-2/+4
| |\
| | * [fix] Abort import cleanly if DB insert fails.Solomon Peachy2012-11-032-2/+4
| * | [backup] Update backup script to include db dump.Solomon Peachy2012-11-041-5/+10
| |/
| * [import] Don't let parallel imports step on each other when making directories.Solomon Peachy2012-10-173-11/+11
| * [misc] Update JustPictures bug workaround.Solomon Peachy2012-10-082-6/+7
| * [rss] Fix thumbnail URIs in RSS feeds.Solomon Peachy2012-07-282-1/+5
| * [fix] Strip off trailing '?' from RSS URLs.Solomon Peachy2012-07-281-0/+9
| * [misc] Update documentation on how to disable open registration.Solomon Peachy2012-01-251-3/+1
| * [fix] keyword search button on photo page was busted.Solomon Peachy2012-01-252-0/+3
| * [misc] Clarify message displayed when php's file_upload feature is off.Solomon Peachy2012-01-101-1/+1
| * [fix] post-registration redirect was broken for admin users.Solomon Peachy2011-12-222-1/+2
| * [fix] 'current volume' display in admin interface was busted.Solomon Peachy2011-12-222-1/+4
| * [fix] use rawurlencode() instead of urlencode()Solomon Peachy2011-12-171-1/+1
| * [fix] URLEncode filenames when downloading images.Solomon Peachy2011-12-172-0/+3
| * [misc] Add support for restricting search by user.Solomon Peachy2011-12-171-0/+8
| * [fix] Include user when browsing by date.Solomon Peachy2011-12-173-5/+9
| * [fix] Don't forget to nuke a user's import results data.Solomon Peachy2011-11-102-1/+4
| * [import] Fix a glitzh in the zip import.Solomon Peachy2011-04-292-0/+2
| * [fix] Properly handle UTF-8 in outgoing emails.Solomon Peachy2010-12-222-5/+12
| * Revert "[fix] Camera Serial Number parsing"Solomon Peachy2010-12-223-10/+8
| * [lang] Add in Chinese-Simplified and Chinese-Traditional (Geoffrey Lee)Solomon Peachy2010-12-223-0/+1733
| * [fix] Camera Serial Number parsingSolomon Peachy2010-12-202-6/+8
| * Merge branch 'master' of git+ssh://git.shaftnet.org/var/lib/git/poSolomon Peachy2010-12-205-9/+16
| |\
| | * [misc] Pretty image URLs now can include a file extension.Solomon Peachy2010-11-043-1/+8
| | * [misc] bump version, since we're going to start diverging.Solomon Peachy2010-11-041-1/+1
| | * [misc] We can also display .gif images.Solomon Peachy2010-11-041-1/+1
| | * [images] Use proper mime-type for displayable images.Solomon Peachy2010-11-042-1/+7
| | * [misc] Apparently this code was referencing the mime type.Solomon Peachy2010-11-031-6/+0
| * | [fix] Ignore 'Color Balance Unknown' tag.Solomon Peachy2010-12-202-0/+4
| |/
| * [fix] URLs in the RSS feed were being mangled.Solomon Peachy2010-10-212-20/+23
| * [fix] Spool actions weren't working on an empty folder.Solomon Peachy2010-10-212-1/+5
* | [fix] Abort import cleanly if DB insert fails.Solomon Peachy2012-11-032-2/+7
* | Cleanups for new stable branchSolomon Peachy2010-09-272-22/+0
|/
* Gear up for the 2.37-final release.Solomon Peachy2010-09-271-1/+1
* Merge remote branch 'origin/devel'Solomon Peachy2010-09-27240-10358/+20384
|\
| * [fix] #437 -- use a 'password' form field for entering resource passwords.Solomon Peachy2010-08-122-1/+2
| * [fix] ensure consistent umask where possible.Solomon Peachy2010-08-106-12/+15
| * Revert "2.37-rc3"v2.37-rc3Solomon Peachy2010-08-061-1/+1
| * 2.37-rc3Solomon Peachy2010-08-061-1/+1
| * Update changelog.Solomon Peachy2010-08-061-1/+4
| * [fix] AVI /mplayer import now works.Solomon Peachy2010-08-062-4/+5
| * [fix] GIMP .xcf import works now. yay!Solomon Peachy2010-08-061-2/+5
| * [misc] Fix formatting for some of the error messages on imports.Solomon Peachy2010-08-061-7/+7
| * [misc] fix an incorrect comment.Solomon Peachy2010-08-051-1/+1
| * [add] Support mplayer for grabbing frames out of video files. Untested.Solomon Peachy2010-08-055-5/+63
| * [misc] Make the import log a redirect.Solomon Peachy2010-08-051-0/+4
| * [add] Support importing with .tar.xz and 7-Zip files.Solomon Peachy2010-08-055-14/+54