summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-11-05Remove cli client CSRF whitelistFlorian Pritz1-12/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Rename is_cli_client to is_api_clientFlorian Pritz2-10/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Disable cli client login functionFlorian Pritz1-3/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Drop plain text error handlingFlorian Pritz2-10/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Simplify error page for cli requestsFlorian Pritz1-5/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Drop user agent based cli client detectionFlorian Pritz1-7/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Drop plain text header/footerFlorian Pritz4-12/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove plaintext API deprecation warningFlorian Pritz1-9/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove cli client only functionsFlorian Pritz1-32/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove special handling of cli clientsFlorian Pritz2-26/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Drop file_plaintext viewsFlorian Pritz12-90/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Update NEWS1.1.1release/1.xFlorian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05install-git-hooks.sh: Add missing -s to lnFlorian Pritz1-1/+1
Broken in 9efd2db81ccf987a5455e0e4575c7d3f9072870f Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Update NEWS1.1.0Florian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Merge branch 'webui-multipaste' into devFlorian Pritz14-27/+531
2016-11-01upload_history: Drop duplicate buttons from bottomFlorian Pritz1-2/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Fix broken multipaste button on history pageFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Fix missing / in redirect after creating multipaste via webuiFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Test \service\multipaste_queueFlorian Pritz1-0/+93
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01s/multipaste_queue: Refactor constructor to support dependency injectionFlorian Pritz1-6/+19
Signed-off-by: Florian Pritz <bluewind@xinu.at>