summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #472 from nextcloud/show-app-name-in-errormsgBjörn Schießle2016-07-201-1/+6
|\
| * Show app name in error message if app could not be loaded. (#25441)Klaas Freitag2016-07-201-1/+6
* | Merge pull request #402 from nextcloud/smb-notificationsMorris Jobke2016-07-204-16/+63
|\ \ | |/ |/|
| * Save the files external mount id in the mount cache tableRobin Appelman2016-07-134-16/+63
* | Merge pull request #441 from nextcloud/fix-maintenance-modeBjörn Schießle2016-07-191-1/+1
|\ \
| * | Fix maintenance modeJoas Schilling2016-07-191-1/+1
* | | Merge pull request #400 from nextcloud/ocs_appframeworkRoeland Douma2016-07-192-0/+67
|\ \ \
| * | | Add route testsRoeland Jago Douma2016-07-181-1/+1
| * | | Make the router handle OCS AppFramework RoutesRoeland Jago Douma2016-07-181-0/+12
| * | | Allow registering of OCS routes with the appframeworkRoeland Jago Douma2016-07-181-0/+55
* | | | Merge pull request #436 from nextcloud/public-regex-to-match-our-clientsMorris Jobke2016-07-191-1/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Copy the regexes to the public interfaceJoas Schilling2016-07-181-1/+11
* | | | Merge pull request #405 from nextcloud/theming-fixesBjörn Schießle2016-07-185-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Use the themed Defaults everywhereJoas Schilling2016-07-155-7/+7
| | |/ | |/|
* | | Prevent syntax error when creating user or changing passwordJoas Schilling2016-07-181-3/+3
| |/ |/|
* | Merge pull request #418 from nextcloud/remove_asset_pipelineMorris Jobke2016-07-183-178/+21
|\ \
| * | Remove asset pipelinRoeland Jago Douma2016-07-153-178/+21
| |/
* | dont check for pgsql extension during setupRobin Appelman2016-07-121-2/+2
* | use pdo for postgres setupRobin Appelman2016-07-122-105/+85
* | Remove duplicate database connect logic in mysql setupRobin Appelman2016-07-123-36/+25
|/
* add test for needsRebundling() checkBjoern Schiessle2016-07-111-1/+11
* Merge pull request #347 from nextcloud/drop-windows-fooLukas Reschke2016-07-115-50/+17
|\
| * Remove unneeded checks if it runs on a Windows machineMorris Jobke2016-07-085-50/+17
* | Merge pull request #350 from nextcloud/fix-check-certificate-bundlesJoas Schilling2016-07-111-1/+2
|\ \
| * | always check the mtime of the system bundle and additionally the user specifi...Bjoern Schiessle2016-07-081-1/+2
| |/
* / Sanitize more config options and stack tracesMorris Jobke2016-07-082-0/+7
|/
* Merge pull request #314 from jernst/masterLukas Reschke2016-07-071-8/+15
|\
| * Disallow certain malformed domain names even if they match the trusted domain...Johannes Ernst2016-07-061-3/+6
| * Trusted domain wildcard checking made shorter, supporting multiple *Johannes Ernst2016-07-061-32/+8
| * Duh, no 'next' in PHP.Johannes Ernst2016-07-061-2/+2
| * Allow wildcard * to be used in trusted domains, to support setups where no re...Johannes Ernst2016-07-051-2/+30
* | Revert "occ web executor (#24957)"Morris Jobke2016-07-071-2/+1
* | Merge branch 'master' into sync-masterMorris Jobke2016-07-0716-51/+101
|\ \
| * | Changed the input option for database-port to required when parameter was pro...Thomas Pulzer2016-07-062-4/+4
| * | Added occ install option for database-port.Thomas Pulzer2016-07-064-7/+23
| |/
| * Merge branch 'master' of https://github.com/nextcloud/serverThomas Pulzer2016-07-041-4/+1
| |\
| | * [master] Use paramterized parameter for \OC\SystemTag\SystemTagManagerLukas Reschke2016-07-031-4/+1
| * | Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-041-2/+2
| |/
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-017-45/+163
| |\
| * \ Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-284-11/+47
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-274-11/+47
| | |\ \
| * | \ \ Merge pull request #59 from nextcloud/theming-appLukas Reschke2016-06-272-1/+21
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Check if server is installedLukas Reschke2016-06-271-1/+1
| | * | | Migrate logic to dynamic controllerLukas Reschke2016-06-273-34/+25
| | * | | write theme settings to databaseBjoern Schiessle2016-06-271-4/+33
| * | | | verify user password on changeBjoern Schiessle2016-06-271-2/+8
| * | | | remove old hook, no longer neededBjoern Schiessle2016-06-271-13/+1
| * | | | check password for link sharesBjoern Schiessle2016-06-272-3/+19
| |/ / /
| * | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-269-103/+248
| |\ \ \
| * \ \ \ Merge pull request #185 from nextcloud/fix-permission-issueLukas Reschke2016-06-211-3/+3
| |\ \ \ \