summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-28Merge branch 'pgsql_controllers'Rafael Bodill3-39/+35
* pgsql_controllers: file/cron: Protecting identifiers Fixing multipaste delete queries
2014-09-28file/cron: Protecting identifiersRafael Bodill1-1/+2
2014-09-19Fixing multipaste delete queriesRafael Bodill2-38/+33
2014-09-19Merge branch 'pgsql_controllers'Rafael Bodill6-196/+210
* pgsql_controllers: Fix user/register mistaken query handling WIP: Cascading delete where_in for in array queries a proper count usage Fix timestamp adjusting for a list of arrays Correct unsupported open/close where query statements File controller uses query builder, except 2 queries Integrating query builder in models User controller queries built dynamically Query builder in user login and controller
2014-09-19Merge branch 'pgsql_migrations'Rafael Bodill13-170/+395
* pgsql_migrations: Optimizing multipaste tables apikeys.created should be timestamp with default now() No column based encoding. Reverting dbforge migration Correcting bracket style for 'if' Migrations support for PostgreSQL
2014-09-19Fix user/register mistaken query handlingRafael Bodill1-1/+1
2014-09-19Optimizing multipaste tablesRafael Bodill1-17/+7
2014-09-19WIP: Cascading deleteRafael Bodill2-20/+40
2014-09-19where_in for in array queries a proper count usageRafael Bodill2-4/+4
2014-09-19Fix timestamp adjusting for a list of arraysRafael Bodill1-2/+6
2014-09-19apikeys.created should be timestamp with default now()Rafael Bodill1-1/+1
2014-09-19Correct unsupported open/close where query statementsRafael Bodill1-3/+1
2014-09-19No column based encoding. Reverting dbforge migrationRafael Bodill1-15/+31
2014-09-19File controller uses query builder, except 2 queriesRafael Bodill1-32/+36
2014-09-18Integrating query builder in modelsRafael Bodill2-51/+42
2014-09-18User controller queries built dynamicallyRafael Bodill1-74/+72
2014-09-18Correcting bracket style for 'if'Rafael Bodill13-95/+56
2014-09-18Query builder in user login and controllerRafael Bodill2-20/+19
2014-09-18Migrations support for PostgreSQLRafael Bodill13-168/+426
2014-09-11Fix black background in thumbnails with transparencyFlorian Pritz1-0/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-30Update NEWSFlorian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-30Improve migration error messageFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-30Merge tag '2.2.0' into workingFlorian Pritz2-8/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Set title on code render pageFlorian Pritz1-0/+2
This got lost in the multipaste change. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Document multipastes on the front pageFlorian Pritz1-0/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Fix code renders for cli clientsFlorian Pritz2-0/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Merge branch 'multipaste' into workingFlorian Pritz26-460/+1128
2014-08-29Increase padding for anchorsFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29add multipaste supportFlorian Pritz22-301/+939
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Add multiple file input boxes on upload formFlorian Pritz2-6/+36
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Simplify sorting of history tableFlorian Pritz3-26/+136
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-08-29Display better errors for CLI requestsFlorian Pritz3-125/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-23Move migration code to CLI callable functionFlorian Pritz6-14/+70
This is necessary to prevent migrations from running multiple times in parallel. A git hook can be used to run this after checkout so impact should be fairly low. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-22update gentoo overlay URLFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-17Fix comptability with php 5.6Florian Pritz1-1/+2
References: http://ellislab.com/forums/viewthread/244510/#1066558 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-11Reword invitation text on front pageFlorian Pritz1-1/+2
The new text is friendlier and less presumptuous and actually describes the reason why I introduced the invitation system. Not sure why I didn't write that in the first place. Thanks to <https://lobste.rs/about> for the idea. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-06-06Merge remote-tracking branch 'remotes/upstream/2.2-stable' into workingFlorian Pritz122-330/+308
Signed-off-by: Florian Pritz <bluewind@xinu.at> Conflicts: system/libraries/Session.php user_guide/
2014-06-06Update CI_VERSIONAndrey Andreev1-1/+1
2014-06-06Issue #3084Andrey Andreev1-5/+2
2014-06-05Updating release dateDerek Jones1-1/+1
2014-06-05Minor style fixes to improve readability in HMAC authenticationQuinn Chrzan1-3/+7
2014-05-31Backport HMAC authentication for CI_SessionAndrey Andreev2-23/+37
2014-05-31Fix broken changelog entriesAndrey Andreev1-2/+2
2014-05-31Add Travis-CI exception for 2.2-stable branchAndrey Andreev1-0/+1
2014-05-31Changelog messages, bump year in copyright noticesAndrey Andreev262-375/+367
2014-05-30Style fixes and adding link to Mcrypt in upgrade instructionsQuinn Chrzan2-2/+2
2014-05-30Bumping version numbers and adding upgrade instructionsQuinn Chrzan145-148/+246
2014-05-30Merge pull request #3071 from EllisLab/bug/xor_encodeQuinn Chrzan3-69/+21
Bug/xor encode
2014-05-30Updating docs for xor_encode removalQuinn Chrzan2-7/+6
2014-05-29Removing xor_encode from Encrypt libraryQuinn Chrzan1-62/+15