summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-04API: Update version to 2.1.1Florian Pritz2-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04API: Fix return type of empty values in file/deleteFlorian Pritz4-2/+26
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04Create function for ensuring that json keys contain objectsFlorian Pritz2-5/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04API: Fix return type of empty values in file/historyFlorian Pritz6-5/+28
If the array is not casted to a object, json_encode will encode it as [] if empty, but {} if it contains data. Always return an object by casting the array to an object if it is empty. Fixes #15 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-06-17Update NEWS2.1.2Florian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-06-17Fix broken lineendings when rendering ascii colorsFlorian Pritz1-1/+1
Without -m ansi2html may not close the span tags at the end of the line. Since we wrap the output lines in our own tags those left-open tags break the rendering. Fix it by letting ansi2html wrap lines into tags on it's own. This adds superflous tags in the HTML, but it works nicely. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-22Update NEWS2.1.1Florian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-22Fix markdown rendering not finding ParsedownFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-15Fix error handling in MY_Input->post_array()Florian Pritz1-1/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-14Update NEWS2.1.0Florian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-12Catch incorrect POST parameters (array vs string)Florian Pritz4-10/+44
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-12Fix uncaught exception in error pageFlorian Pritz1-1/+1
Can be triggered by accessing an unknown page like /file/foobar Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Unify look of client installation instructionsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Add FreeBSD client installation instructionsFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Use === for some equality checksFlorian Pritz2-5/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-06Add filename extensions for some SQL dialectsFlorian Pritz1-0/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26s/renderer: Extract json reformater methodFlorian Pritz1-16/+28
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26s/renderer: Pass output_cache in constructorFlorian Pritz2-13/+16
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26Extract render code into dedicated classFlorian Pritz2-144/+168
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-24Improve error handling in json reformaterFlorian Pritz1-4/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-24Allow alternative colors in alert templateFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-22Reformat single-line JSON when renderingFlorian Pritz1-0/+5
Be conservative and only apply the reformating for single line pastes. This should cover the most common cases and protect against trying to reformat non-json content. Fixes #14 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-22Pass file content to lexer via stdinFlorian Pritz1-2/+5
This allows to easily modify the content before rendering it. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-03Update NEWS2.0.0Florian Pritz1-0/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-03run-tests.sh: Only use phpdbg when coverage information is gatheredFlorian Pritz1-3/+8
For some reason phpdbg crashes for me right now so this is a quick workaround to get the tests to run again. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-03gitignore: Fix path to main.min.jsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-02-01return_bytes(): Throw exception on unhandled unit typeFlorian Pritz2-3/+13
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-02-01Test-More: Improve debug outputFlorian Pritz1-5/+14
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-02-01tests: Expect string instead of intFlorian Pritz1-4/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-01-31config: Add exmple for database port settingFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-10filebin_helper: Fix tabsReikion1-7/+7
Changes by Florian Pritz: - Split off from "Make sure that return_bytes function returns int value" Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-10Make sure that return_bytes function returns int valueReikion2-1/+2
php_admin_value[post_max_size] in PHP fpm pool config set to big integer (i.e. 106954752) causes fb-client to crash if file is bigger than 10485760 bytes with traceback Traceback (most recent call last): [...] File "/usr/bin/fb", line 138, in upload_files if self.serverConfig is not None and (currentChunkSize + filesize > self.serverConfig["request_max_size"] \ TypeError: unorderable types: int() > str() because api/v2.1.0/file/get_config returns "request_max_size" as string Changes by Florian Pritz: - Add test - Add github PR body as commit message - Split off indentation change Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05test_file_upload: Ensure we compare the correct contentdev-2.xFlorian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05tests: Add env variable to disable code coverage collectionFlorian Pritz2-3/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Parallelize remaining API testsFlorian Pritz9-420/+532
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Parallelize some API testsFlorian Pritz3-137/+190
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05muser: Rename login_cli_client to login_api_clientFlorian Pritz1-10/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove API v1 compatability codeFlorian Pritz2-6/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05API: Drop v1Florian Pritz4-666/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Test calling endpoints with unsupported authentication methodFlorian Pritz1-0/+26
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05MY_Controller: Extract CSRF code into methodFlorian Pritz1-28/+37
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05api/user/create_apikey: Directly log in with username/pwFlorian Pritz1-0/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05tests: Fix testing of username/pw with unsupported endpointFlorian Pritz2-8/+8
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/MY_Controller: Extract CSRF protection code into methodFlorian Pritz1-5/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/MY_Controller: Extract database migration code into methodFlorian Pritz1-14/+20
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Add do_websumit to CSRF exception listFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove cli client upload handlerFlorian Pritz2-54/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/file: Remove upload detectionFlorian Pritz1-3/+1
This only existed for curl based uploading which is no longer supported Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/user: Drop $this->view_dirFlorian Pritz1-17/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/file_default: Drop $this->view_dirFlorian Pritz1-14/+12
Signed-off-by: Florian Pritz <bluewind@xinu.at>