summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Nextcloud license header for new filesroot2016-07-288-64/+83
* Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-27133-178/+914
|\
| * [tx-robot] updated from transifexNextcloud bot2016-07-2774-56/+130
| * Merge pull request #349 from nextcloud/ldab-groupOfUniqueNamesblizzz2016-07-261-1/+1
| |\
| | * add groupOfUniqueNames as valid group object classRobin Appelman2016-07-081-1/+1
| * | Add app icons for Comments and Tags (#579)Jan-Christoph Borchardt2016-07-262-0/+8
| * | Merge pull request #563 from nextcloud/log-internet-connection-exceptionMorris Jobke2016-07-262-2/+10
| |\ \
| | * | Log exception that is thrown by internet connection checkMorris Jobke2016-07-262-2/+10
| * | | Merge pull request #567 from nextcloud/wb-admin-log-buttonsJoas Schilling2016-07-262-10/+13
| |\ \ \
| | * | | Orders Admin Log Buttonroot2016-07-262-10/+13
| |/ / /
| * | | Merge pull request #525 from nextcloud/fix-theme-logo-positionJoas Schilling2016-07-264-9/+14
| |\ \ \ | | |/ / | |/| |
| | * | 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
| | * | 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 CSSMorris Jobke2016-07-252-5/+6
| * | | | [tx-robot] updated from transifexNextcloud bot2016-07-266-4/+6
| * | | | Merge pull request #292 from nextcloud/recent-filesWilliam Bargent2016-07-2518-34/+640
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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 #544Arthur Schiwon2016-07-2512-22/+37
| * | | | | Merge pull request #523 from Faldon/masterJoas Schilling2016-07-2512-33/+42
| |\ \ \ \ \
| | * | | | | 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
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #547 from nextcloud/fix-restore-all-filesJoas Schilling2016-07-251-2/+1
| |\ \ \ \ \
| | * | | | | Fix error message while restoring all filesMorris Jobke2016-07-251-2/+1
| |/ / / / /
* | | | | | comments amendedroot2016-07-273-3/+2
* | | | | | final changesroot2016-07-278-30/+23
* | | | | | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2577-175/+346
|\| | | | |
| * | | | | Merge pull request #530 from nextcloud/fix-theme-loadingMorris Jobke2016-07-252-2/+10
| |\ \ \ \ \
| | * | | | | 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 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 themRobin Appelman2016-07-231-9/+11
| |/ / / / /
| * / / / / [tx-robot] updated from transifexNextcloud bot2016-07-2328-124/+150
| |/ / / /