summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-27Deleted useless .htaccess file, added missed index.html files.Ender Teszla5-1/+40
2014-02-23user/create_apikey: Use empty comment if unsetFlorian Pritz1-0/+1
False gets converted to "0" when being stored in the DB which we don't want. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-02-21Implement multiple access levels for api keysFlorian Pritz6-16/+71
This allows to use an api key to write a completly standalone client. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-02-15Work around PHP 5.3 limitationFlorian Pritz1-3/+5
$this in anonymous functions is only supported in PHP >= 5.4 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-24client: add gentoo overlayFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-21Disable automatic code display for SVG filesFlorian Pritz1-1/+0
People usually want to view them rather than read the code. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-16INSTALL: clarify config change needed for mod_rewriteFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-10let GD itself determine what it can readFlorian Pritz1-14/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-07Manually apply an improved version of PR #2427Andrey Andreev1-6/+5
2013-12-11Merge pull request #2761 from a-krebs/2.1-stableAndrey Andreev1-2/+2
Make oci_execute() calls inside num_rows() non-committing. Fixes #696.
2013-12-11Make oci_execute() calls inside num_rows() non-committing. Fixes #696.Aaron Krebs1-2/+2
Fixes bug in Oracle driver. Calls to oci_execute() inside num_rows() of the Oracle driver can be made non-committing to fix bug with transactions. Since calls to oci_execute are only there to reset which row is next in line for oci_fetch() calls, it's fine to not commit.
2013-12-05Fix some spacing issues from PR #2689Andrey Andreev2-10/+5
2013-11-09use cache_function() everywhereFlorian Pritz2-21/+16
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-11-09cache file/thumbnail responsesFlorian Pritz1-5/+13
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-11-09implement cache_function to easily cache return values of functionsFlorian Pritz1-0/+18
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-31Fix alignment of date column in plain text viewFlorian Pritz1-1/+3
This got broken by 2a6a1c63cb21015009fe4fd13f62cdac64e1fe36 and 05a4d686b578794c180ddfaf4945a9d7443f330e. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-22wrap long lines in READMEFlorian Pritz1-2/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-22Remove unnecessary TODOFlorian Pritz1-1/+0
It's fine if users can invite an unlimited amount of people. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-22Update CSP header; change order to fix svg display in firefoxFlorian Pritz1-1/+1
Apparently firefox doesn't like "style-src * 'unsafe-inline'", but wants "style-src 'unsafe-inline' *" otherwise it doesn't honor 'unsafe-inline'. In chromium both behave the same. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-18Merge pull request #2689 from blowdoof/upstream_21Andrey Andreev3-13/+16
Bugfix 2.1 sqlsrv driver
2013-10-18Added changelog entriesblowdoof1-0/+1
2013-10-18Merge branch 'upstream_21' of https://github.com/blowdoof/CodeIgniter into ↵blowdoof0-0/+0
upstream_21
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-6/+2
This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447.
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-5/+1
This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447.
2013-10-18Bugfix on the active record join statement with empty conditionsblowdoof1-2/+6
2013-10-18Bugfix on the sqlsrv forge driver rename_table functionblowdoof1-5/+3
2013-10-18Bugfix on the sqlsrv forge driver create_table functionblowdoof1-11/+9
2013-10-18removed unnecessary assignmentblowdoof1-1/+0
2013-10-18Style correctionblowdoof1-6/+6
2013-10-18Fix on sqlsrv_forge drop_tabletino1-1/+8
2013-10-18Bugfix on truncate commandtino1-1/+1
2013-10-06Fix display error when redering markdownLukas Epple1-2/+4
Initial-patch-by: Lukas Epple <lukas.epple@me.com> Switch from <table> to <div> like we did for pygments. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-25Align the brand image correctlyMarkus Cisler2-1/+5
2013-09-25Remove chmod on uploaded filesFlorian Pritz1-2/+0
It interferes with multiuser setups if you use X-Sendfile and it isn't really needed anyway because you can set an upload_path outside the docroot and because the default path is protected by an .htaccess file. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-25Remove whitespaces from upload form textareaPierre Schmitz1-4/+4
2013-09-25update NEWSFlorian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-25Merge branch 'working'Florian Pritz195-1373/+1067
2013-09-25Change upload form layoutMarkus Cisler2-35/+45
2013-09-25Fix indentation on upload formMarkus Cisler1-13/+13
2013-09-25Make tables responsiveMarkus Cisler4-91/+99
2013-09-23Limit header nav width to content widthFlorian Pritz1-39/+39
Looks like this has been missed somewhere along the way (36a1bb6770cb76ec7baf4e215c4379b070c60639) and ended up too deep down. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-23Remove unneeded return statements after show_errorFlorian Pritz2-2/+0
show_error() already exits after displaying the message. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-23Implement rangeDownload() as driver and provide sendfile implementations for ↵Pierre Schmitz7-101/+222
Nginx and Lighttpd * The rangeDownload() function has been moved to libraries/Ddownload/drivers/Ddownload_php.php * The nginx and lighttpd drivers can be set via $config['download_driver'] Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-09-22Add some more file extension -> lexer mappingsFlorian Pritz1-0/+18
Mimetype detection doesn't always properly detect code (I saw javascript as plain text, c as asm) and if there is an extension we can likely get better result by using that. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-22Move user_logged_in check to controller constructorFlorian Pritz6-13/+6
TL;DR: Allows us to show a proper error page if encryption_key is missing from the config. muser->logged_in() can load the session class which will die if encryption_key is not set in the config causing an error to be displayed. Because the header is also loaded when we display an error loading the class will be tried again. CI maintains an array with information which classes have been tried to be loaded and will simply return true without loading again. muser->logged_in() will then try to access $this->session which doesn't exist. Since all of this happens when we are already in the header the error message appears in the navigation being hard to read. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-22Merge branch 'working-split/bootstrap3' into workingFlorian Pritz27-1136/+601
2013-09-22Fix autoresizing of textarea on upload_formFlorian Pritz2-4/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-22Fix form display errors on small devicesFlorian Pritz5-5/+5
form-horizontal causes the viewport to become too wide. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-22fix paste view on mobile devicesMarkus Cisler3-89/+107
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-22fix forms on password reset pageMarkus Cisler1-11/+17