summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #371 from nextcloud/implement-get-titleJoas Schilling2016-07-112-0/+25
|\ | | | | Implement "getTitle"
| * Implement "getTitle"Lukas Reschke2016-07-112-0/+25
| | | | | | | | Fixes https://github.com/nextcloud/server/issues/341
* | Merge pull request #364 from nextcloud/ca-bundle-testsBjörn Schießle2016-07-112-1/+103
|\ \ | | | | | | add test for needsRebundling() check
| * | add test for needsRebundling() checkBjoern Schiessle2016-07-112-1/+103
| |/
* | Merge pull request #361 from nextcloud/make-theming-work-with-pretty-urlsLukas Reschke2016-07-113-6/+6
|\ \ | | | | | | Make theming work with pretty URLs
| * | Fix testsoparoz2016-07-111-4/+4
| | |
| * | Make theming work with pretty URLsoparoz2016-07-112-2/+2
| |/ | | | | | | | | In some envs the rewrite rules for pretty URLs apply to all CSS files, so let's not end the route name with that etension. Fixes #315
* | Merge pull request #362 from nextcloud/fix_nodetest_nodbRoeland Douma2016-07-111-123/+76
|\ \ | |/ |/| Improve NodeTest
| * Improve NodeTestRoeland Jago Douma2016-07-111-123/+76
|/ | | | | | * Do not use DB * Fix phpunit-5.4 warnigns * Moved commong stuff to setup
* Change occurence of ownCloud (#352)Morris Jobke2016-07-111-3/+2
|
* Merge pull request #347 from nextcloud/drop-windows-fooLukas Reschke2016-07-1122-269/+51
|\ | | | | Remove unneeded checks if it runs on a Windows machine
| * Fix some more testsJoas Schilling2016-07-111-96/+1
| |
| * Remove unneeded checks if it runs on a Windows machineMorris Jobke2016-07-0821-173/+50
| | | | | | | | * the setup check is still there
* | Merge pull request #320 from nextcloud/faster_autoloaderRoeland Douma2016-07-111-0/+0
|\ \ | | | | | | [3rdparty] Static classmap for 3rdparty
| * | [3rdparty] Static classmap for 3rdpartyRoeland Jago Douma2016-07-111-0/+0
| | | | | | | | | | | | | | | This speedsup classmap loading significantly on php 5.6 and higher. Older php versions are not affected.
* | | Merge pull request #350 from nextcloud/fix-check-certificate-bundlesJoas Schilling2016-07-111-1/+2
|\ \ \ | | | | | | | | fix check if the certificate bundle needs to be updated
| * | | always check the mtime of the system bundle and additionally the user ↵Bjoern Schiessle2016-07-081-1/+2
| | | | | | | | | | | | | | | | specific certificate bundle if a user is given
* | | | Add new "Recent files" icon to files app (#356)Bugsbane2016-07-112-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added new "nav-icon-recent" CSS class Added the class "nav-icon-recent" to display the new "recent files" file list view to be added by @icewind1991 in PR https://github.com/nextcloud/server/pull/292 It's now placed after nav-icon-files which was where @jancborchardt was suggesting iirc. * Add new "Recent files" clock icon Add the new icon for "Recent files" file list view in the files app by @icewind1991, as discussed in PR https://github.com/nextcloud/server/pull/292 Icon is already compressed/cleaned by scour rather than svgo as svgo seems to corrupt it. * Alter colour of "Recent" icon from grey to black Change colour of the "recently used files" icon from grey to black, to match other icons in the files app. * Replace recent icon with black, optimized version Just updates the colour of the icon for "Recent files" from a grey version, to a black optimised version.
* | | | Merge pull request #345 from nextcloud/sanitize-logs-and-stacktracesJoas Schilling2016-07-112-0/+7
|\ \ \ \ | | | | | | | | | | Sanitize more config options and stack traces
| * | | | Sanitize more config options and stack tracesMorris Jobke2016-07-082-0/+7
| | |_|/ | |/| |
* | | | Merge pull request #351 from nextcloud/improve_filetest_unittestMorris Jobke2016-07-111-237/+153
|\ \ \ \ | | | | | | | | | | Improve FileTest
| * | | | Improve FileTestRoeland Jago Douma2016-07-081-237/+153
| |/ / / | | | | | | | | | | | | | | | | | | | | * No longer requires DB * Fixed phpunit 5.4 warnings * Moved common stuff to Setup phase
* | | | Merge pull request #358 from nextcloud/phpunit-warning-fixes-appframeworkRoeland Douma2016-07-1113-116/+185
|\ \ \ \ | | | | | | | | | | Phpunit warning fixes appframework
| * | | | Mock loggerRoeland Jago Douma2016-07-111-3/+3
| | | | |
| * | | | Fix phpunit-5.4 wargningRoeland Jago Douma2016-07-1113-116/+185
|/ / / / | | | | | | | | | | | | | | | | * getMock is deprecated. * \PDOStatement mocking fails hard on phpunit 4.8
* | | / [tx-robot] updated from transifexNextcloud bot2016-07-1110-4/+12
| |_|/ |/| |
* | | Merge pull request #330 from nextcloud/php7.0-ciMorris Jobke2016-07-103-12/+15
|\ \ \ | | | | | | | | PHP 7.0 CI
| * | | Run mysql and posgres on 5.6Roeland Jago Douma2016-07-091-7/+7
| | | |
| * | | Bump drone to use newer php7 dockerRoeland Jago Douma2016-07-081-4/+4
| | | |
| * | | Disable coverage for nowRoeland Jago Douma2016-07-081-3/+3
| | | | | | | | | | | | | | | | Coverage generation takes to long. So disabling for now.
| * | | Add 5.6 sqlite ciRoeland Jago Douma2016-07-081-3/+6
| | | |
| * | | Move 'main' ci to php7 (speed)Roeland Jago Douma2016-07-081-4/+4
| | | |
| * | | Correction is no longer required in php7Roeland Jago Douma2016-07-081-1/+1
| | | |
| * | | Fix phpunit Trait warningRoeland Jago Douma2016-07-081-1/+1
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2016-07-108-2/+10
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-07-0954-112/+154
|/ /
* | Merge pull request #317 from nextcloud/scrutinizer-fixedRoeland Douma2016-07-0819-30/+55
|\ \ | |/ |/| Scrutinizer fixes
| * Fix test using private propertriesRobin Appelman2016-07-082-2/+2
| |
| * combine if statementsRobin Appelman2016-07-081-13/+10
| |
| * handle errors while getting fileinfoRobin Appelman2016-07-081-1/+1
| |
| * Allow nullRobin Appelman2016-07-081-1/+1
| |
| * Fix type hintingRobin Appelman2016-07-085-6/+7
| |
| * add missing varRobin Appelman2016-07-081-2/+2
| |
| * hint global handlebarsRobin Appelman2016-07-083-2/+8
| |
| * dont overwrite a variable with a different typeRobin Appelman2016-07-081-3/+3
| |
| * Fix undefined propertiesRobin Appelman2016-07-086-2/+23
|/
* [tx-robot] updated from transifexNextcloud bot2016-07-0846-150/+200
|
* Merge pull request #314 from jernst/masterLukas Reschke2016-07-073-9/+51
|\ | | | | Allow wildcard * to be used in trusted domains
| * Extended documentation on trusted_domains to cover ports and wildcards.Johannes Ernst2016-07-071-0/+6
| |
| * Disallow certain malformed domain names even if they match the trusted ↵Johannes Ernst2016-07-062-3/+10
| | | | | | | | | | | | domain expression Stricter checking for valid domain names