summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| |\ \ \ \
| | * | | | Show error message if config file is not readableMorris Jobke2016-06-211-3/+3
| * | | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2115-58/+388
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | fix more stringsMorris Jobke2016-06-204-12/+8
| * | | | | Remove obsolete contacts_cards_properties tableFlorian Preinstorfer2016-06-191-0/+1
| * | | | | Drop obsolete tables: gallery_albums and gallery_photosFlorian Preinstorfer2016-06-191-1/+3
| * | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-141-1/+3
| |\ \ \ \ \
| * | | | | | emit correct signal if a app get's disabledBjoern Schiessle2016-06-131-1/+1
| * | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-1110-3/+331
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-101-1/+4
| |\ \ \ \ \ \ \
| | * | | | | | | add hide file list optionBjoern Schiessle2016-06-091-1/+4
| * | | | | | | | Downstream 2016-06-09Arthur Schiwon2016-06-0916-55/+198
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Downstream 2016-06-08"blizzz2016-06-0910-89/+27
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | make sure $data['mtime'] is always a timestampRobin Appelman2016-06-091-0/+3
| * | | | | | | | don't update storage mtime if we can't get the modified dateRobin Appelman2016-06-091-1/+4
| * | | | | | | | Ignore forbidden files while scanningRobin Appelman2016-06-091-1/+6
| * | | | | | | | dissalow symlinks in local storages that point outside the datadirRobin Appelman2016-06-092-2/+32
| * | | | | | | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-091-2/+2
| * | | | | | | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-091-0/+1
| * | | | | | | | Do not allow to store boolean configs, they behave unexpected on postgresJoas Schilling2016-06-092-3/+8
| * | | | | | | | Fix warnings when trying to get mtime of non existing filesRobin Appelman2016-06-091-3/+3
| * | | | | | | | return success when deleting ghost filesRobin Appelman2016-06-091-1/+3
| * | | | | | | | allow deleting "ghost files" trough the View and Node apiRobin Appelman2016-06-091-15/+28
| * | | | | | | | THIS IS NEXTCLOUD! adjusting the designJan-Christoph Borchardt2016-06-081-7/+7
| * | | | | | | | Remove "Help" link from personal sidebarLukas Reschke2016-06-061-2/+4
* | | | | | | | | Use named parameter instead of direct value for system tags search param (#25...Vincent Petry2016-07-061-1/+1
* | | | | | | | | fix swift primary object store test (#25281)Thomas Müller2016-07-051-1/+1