summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-08-04Add audio and video players to multipastesFlorian Pritz4-1/+28
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-08-02Add PLS playlist support for multipastesFlorian Pritz2-0/+32
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-08-02Merge branch 'add-range-selection' into devFlorian Pritz3-2/+11
2015-08-02Fix checkboxes.jsFlorian Pritz3-3/+9
- Incorrect path to .js file - Autoloading and the data-api don't work so load and run it explicitly Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-08-02Support range selection on history pagetaxus133-2/+5
Support range selection on history page by adding jquery.checkboxes
2015-08-02Fix handling of php errorsFlorian Pritz1-0/+5
When the exception handler moved to a dedicated class _exception_handler was no longer defined so CI defined it with it's own code which does not throw an exception but rather just prints the less helpful CI error page. This could be triggered by deleting an upload while the cache_backend is set to "file" and the cache does not hold the filedata for the upload being deleted. In that case PHP throws a warning (unlink on a missing file) which would no longer be caught with try/catch in the cache backend's delete() function. Now the error is catchable again. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-07-18tests: Run from ./public_html0.9.4Florian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-07-18index.php: Include correct fileFlorian Pritz1-1/+1
If $PWD is not the root of the working copy this would try to include $PWD/public_html/index.php. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-07-18Update NEWS0.9.3Florian Pritz1-0/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-07-18Display hash on file info pageFlorian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-07-18Fix double path in exception handlerFlorian Pritz1-1/+1
APPPATH is an absolute path already so prepending FCPATH will make an invalid path. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-07-10Make javascript baseUrl honor subdirsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-06-05Keep email reset keys after useFlorian Pritz1-2/+0
The user might click the wrong link or might change their mind and it is really not necessary to clean them up early. Let the cron job take care of that. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-06-05Allow users to change their emailFlorian Pritz4-3/+135
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-06-05data/local/.gitignore: Add some more filesFlorian Pritz1-0/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-06-05Move public files to ./public_htmlFlorian Pritz62-226/+242
./data/local is not moved because it contains likely untracked files and moving it would throw an error when updating. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-06-04Refactor exception handling into dedicated classFlorian Pritz4-140/+158
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-06-01Allow stderr for pygmentsFlorian Pritz1-1/+0
This happens when an invalid lexer is used so until we use the exceptions this should not be forbidden since we won't fall back to plain text then. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-31Add linebreak to exception HTMLFlorian Pritz1-1/+2
<pre> already breaks, but this ensures that in case the error is printed to cli there will also be a line break. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-31Display error id when printing exceptionFlorian Pritz1-0/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-31test: Add more \libraries\Image testsFlorian Pritz3-0/+30
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28JS: Use newest file time for cache buster0.9.2Florian Pritz1-2/+20
Really no need to reload the files with each page load. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28Always display exceptions when running via CLIFlorian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28imagemagick: Use nested exceptionFlorian Pritz2-3/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28Handle nested ExceptionsFlorian Pritz1-13/+36
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28Improve running of external commandsFlorian Pritz4-27/+156
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28get_lexer_list.py: Use /usr/bin/env shebangFlorian Pritz1-1/+1
This is more portable and allows for PATH overrides in case /usr/bin/python is too old (2.6) to run this file. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28Execute scripts directlyFlorian Pritz2-2/+2
No need to specify the interpreter twice. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-28Fix error when removing missing entries from file cacheFlorian Pritz1-1/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-22Fix incorrect EXIF orientation on thumbnail history0.9.1Florian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-22No need to remove main.min.*.js anymore. Relict from earlier stage.Joakim Reinert1-1/+0
2015-05-22Handle fresh clones gracefully in post-merge hookJoakim Reinert1-3/+6
2015-05-22Change INSTALL doc to instruct running post-merge hook manually onceJoakim Reinert1-2/+3
This renders running the update database command obsolete (it's already run by the hook)
2015-05-22Add instructions to install git hooks to INSTALLJoakim Reinert1-0/+4
2015-05-22Fix missing db prefix in migration0.9.0Florian Pritz2-12/+12
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-22Forbid cli requests until database is updatedFlorian Pritz1-1/+1
This mainly tries to prevent problems when file cron is run with an old database. Tools is whitelisted for the future, if there are cron jobs in tools they will need to check the migrations themselves. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-22Remove unneeded duplicates in file_storageFlorian Pritz3-1/+80
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21migration 14: Fix error if file was already renamedFlorian Pritz1-1/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21Update NEWSFlorian Pritz1-0/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21tests: Die early on db errorsFlorian Pritz2-2/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21Calc correct total size for history with duplicate hashesFlorian Pritz2-1/+22
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21\c\file::clean_stale_files: Increase robustnessFlorian Pritz1-3/+7
Delete files not matching our pattern and be forgiving if directories are cleaned up by mfile->delete_data_id. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21test: run-tests.sh be less verboseFlorian Pritz1-3/+3
Test can now also be run with multiple jobs (-jX) and php -S will no longer interfere with the output. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21Clarify variable usage in \c\tools->testFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21tests: Rework database handlingFlorian Pritz3-36/+32
We no longer interfere with the normal installation's database settings. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21tests: Make prove --state work; Restructure testsFlorian Pritz8-18/+17
This moves all tests into a subdirectory and lets prove itself figure out which tests exist. It seems if you supply the testlist via arguments or stdin --state won't affect the order. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21Update munin pluginFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21test: different files with same checksumFlorian Pritz4-8/+34
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21Support multiple files with the same hashFlorian Pritz8-131/+231
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2015-05-21Fix missing 2nd tab when repastingFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>