summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #525 from nextcloud/fix-theme-logo-positionJoas Schilling2016-07-264-9/+14
|\ | | | | Fix theme logo position and shape
| * Theming: Fix preview and center alignment of logoJulius Haertl2016-07-252-4/+5
| |
| * Adjust testsLukas Reschke2016-07-221-3/+6
| |
| * Update header.cssJos Poortvliet2016-07-221-1/+1
| | | | | | make the logo look good on the login page
| * Update themingcontroller.phpJos Poortvliet2016-07-221-1/+2
| |
* | Merge pull request #557 from nextcloud/fix-css-scope-files-externalMorris Jobke2016-07-262-5/+6
|\ \ | | | | | | Add proper scope to files external CSS
| * | Add proper scope to files external CSSMorris Jobke2016-07-252-5/+6
| | | | | | | | | | | | * for select2
* | | [tx-robot] updated from transifexNextcloud bot2016-07-266-4/+6
| | |
* | | Merge pull request #292 from nextcloud/recent-filesWilliam Bargent2016-07-2518-34/+640
|\ \ \ | | | | | | | | Add "Recent" file listing
| * | | fix testRobin Appelman2016-07-251-1/+1
| | | |
| * | | block user sorting in recent filesRobin Appelman2016-07-222-1/+7
| | | |
| * | | use limit instead of since when listing recent filesRobin Appelman2016-07-225-54/+18
| | | |
| * | | fix testRobin Appelman2016-07-223-8/+30
| | | |
| * | | Add recent file listingRobin Appelman2016-07-226-2/+285
| | | |
| * | | add recent files api endpointRobin Appelman2016-07-223-18/+56
| | | |
| * | | add recent files to node apiRobin Appelman2016-07-225-5/+298
| | | |
| * | | Fix storage id with storage jailRobin Appelman2016-07-221-1/+1
| | |/ | |/|
* | | Merge pull request #509 from nextcloud/appframework_magic_allow_default_varsMorris Jobke2016-07-251-0/+6
|\ \ \ | |_|/ |/| | AppFramework add default values (ApiController) as parameters
| * | Inject parametersRoeland Jago Douma2016-07-221-0/+6
| | |
* | | Merge pull request #550 from nextcloud/ldap-integration-test-autoloaderMorris Jobke2016-07-2512-22/+37
|\ \ \ | | | | | | | | fix autoloading in LPAP integration tests, resolves #544
| * | | fix autoloading in LPAP integration tests, resolves #544Arthur Schiwon2016-07-2512-22/+37
| | | |
* | | | Merge pull request #523 from Faldon/masterJoas Schilling2016-07-2512-33/+42
|\ \ \ \ | | | | | | | | | | Renamed file logging
| * | | | Renamed test classes for file logging tests.Thomas Pulzer2016-07-222-3/+3
| | | | |
| * | | | Changed code style and made use of '===' comparison.Thomas Pulzer2016-07-221-1/+4
| | | | |
| * | | | Reverted the default syslog tag to avoid breaking existing systems.Thomas Pulzer2016-07-221-1/+1
| | | | |
| * | | | Changed logtype to file instead of owncloud.Thomas Pulzer2016-07-2213-31/+37
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated the config sample to point to log_type='file' - Renamed the Class for logfile logging to File in namespace 'OC\Log\'. Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'. - Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'. Changed registration of the command to use 'OC\Core\Command\Log\File'. - Changed default Syslog tag to Nextcloud - Retained backwards compatibility for configs with 'logtype' => 'owncloud' - Adjusted tests for the new file log. Closes #490.
* | | | Merge pull request #547 from nextcloud/fix-restore-all-filesJoas Schilling2016-07-251-2/+1
|\ \ \ \ | | | | | | | | | | Fix error message while restoring all files
| * | | | Fix error message while restoring all filesMorris Jobke2016-07-251-2/+1
|/ / / / | | | | | | | | | | | | | | | | * use $_POST['files'] only of ssinlge files are restored * fixes #528
* | | | Merge pull request #530 from nextcloud/fix-theme-loadingMorris Jobke2016-07-252-2/+10
|\ \ \ \ | | | | | | | | | | Make sure we try to autoload the class
| * | | | Make sure we try to autoload the classJoas Schilling2016-07-222-2/+10
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-07-2510-6/+78
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-07-2410-2/+24
| | | |
* | | | Merge pull request #533 from nextcloud/oparoz-ns-server-contributing.mdRoeland Douma2016-07-231-1/+1
|\ \ \ \ | | | | | | | | | | change core to server
| * | | | change core to serverOlivier Paroz2016-07-231-1/+1
| | | | |
* | | | | Merge pull request #534 from nextcloud/twofactor-issetJoas Schilling2016-07-231-9/+11
|\ \ \ \ \ | |/ / / / |/| | | | Check if an app provide two-factor-auth providers before we try to use them
| * | | | Check if an app provide two-factor-auth providers before we try to use themRobin Appelman2016-07-231-9/+11
|/ / / /
* / / / [tx-robot] updated from transifexNextcloud bot2016-07-2328-124/+150
|/ / /
* | | Fix search box overlapping on mobile (#450)Jan-Christoph Borchardt2016-07-223-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | * fix searchbox overlapping on mobile * also adjust log in background color in theme * Fix unit tests
* | | Merge pull request #524 from nextcloud/ocs_appframework_status_codeLukas Reschke2016-07-222-2/+41
|\ \ \ | | | | | | | | Set proper status code in OCS AppFramework Middleware
| * | | Add testsRoeland Jago Douma2016-07-221-1/+35
| | | |
| * | | Set proper status code in OCS AppFramework MiddlewareRoeland Jago Douma2016-07-221-1/+6
| | |/ | |/|
* | | Merge pull request #526 from nextcloud/bumb-app-requirementsJoas Schilling2016-07-2217-17/+17
|\ \ \ | | | | | | | | bumb compatible app versions for core apps
| * | | Also increase the min versionJoas Schilling2016-07-2217-17/+17
| | | |
| * | | bumb compatible app versions for core appsRobin Appelman2016-07-2217-17/+17
| |/ /
* | | Merge pull request #522 from nextcloud/ocs_correct_login_exceptionRoeland Douma2016-07-222-2/+4
|\ \ \ | |/ / |/| | OCS correctly handle login exception
| * | Fix intergration testsRoeland Jago Douma2016-07-221-2/+2
| | |
| * | Catch LoginExceptionRoeland Jago Douma2016-07-221-0/+2
| |/
* | Merge pull request #517 from nextcloud/fix-typoJoas Schilling2016-07-222-3/+3
|\ \ | | | | | | Fix typo in docs
| * | Use app name from stable9Joas Schilling2016-07-221-1/+1
| | |
| * | Fix typoJoas Schilling2016-07-221-2/+2
| |/