summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-094-2/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-0820-70/+102
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-074-2/+4
|
* Merge pull request #20184 from owncloud/add-carddavThomas Müller2015-11-0626-23/+1056
|\ | | | | Introducing CardDAV into core
| * adding individual phpunit.xml and bootstrap.phpThomas Müller2015-11-062-0/+38
| |
| * Adding occ command to create an addressbookThomas Müller2015-11-062-0/+60
| |
| * Introducing CardDAV into coreThomas Müller2015-11-0622-23/+958
|/
* Merge pull request #20365 from owncloud/autoloader-fixThomas Müller2015-11-063-22/+69
|\ | | | | [autoloader] Make sure to load full paths
| * [autoloader] Make sure to load construct full pathsRoeland Jago Douma2015-11-063-22/+69
| | | | | | | | | | This reduces a lot of the autoloader magic and makes sure that we generate full paths in the autoloader.
* | Merge pull request #18039 from owncloud/favicon-up-to-ie10Thomas Müller2015-11-065-3/+3
|\ \ | | | | | | Add favicon for IE8-10
| * | update example theme faviconMorris Jobke2015-11-031-0/+0
| | |
| * | Add favicon for IE 8+Morris Jobke2015-11-034-3/+3
| | |
* | | Merge pull request #20350 from owncloud/add-log-statement-for-cronThomas Müller2015-11-061-0/+2
|\ \ \ | | | | | | | | Add debug log statement for IJobList steps in cron.php
| * | | Add debug log statement for IJobList steps in cron.phpMorris Jobke2015-11-061-0/+2
| | | | | | | | | | | | | | | | * makes debugging easier
* | | | Merge pull request #20346 from owncloud/show-language-code-for-unknown-languagesThomas Müller2015-11-061-0/+8
|\ \ \ \ | | | | | | | | | | Show the language code in personal settings for unknown languages
| * | | | Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Steps to reproduce: * having an unknown language set in oc_preferences * browse the personal settings * only get listed the first letter of this language in the language chooser
* | | | | Merge pull request #20358 from owncloud/extstorage-properlythrowexceptionThomas Müller2015-11-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Properly throw exception in OC_Mount_Config::getBackendStatus
| * | | | | Properly throw exception in OC_Mount_Config::getBackendStatusVincent Petry2015-11-061-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #20359 from owncloud/mark-files-drop-as-shippedThomas Müller2015-11-061-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Mark files_drop as shipped
| * | | | Mark files_drop as shippedLukas Reschke2015-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/enterprise/issues/895
* | | | | Merge pull request #20340 from owncloud/fix-ocs-error-codeThomas Müller2015-11-062-2/+17
|\ \ \ \ \ | |/ / / / |/| | | | Revert OCS error code change from #20135
| * | | | Revert OCS error code change from #20135Joas Schilling2015-11-052-2/+17
| | | | |
* | | | | Merge pull request #20348 from owncloud/issue-20303-integer-group-namesThomas Müller2015-11-062-1/+29
|\ \ \ \ \ | | | | | | | | | | | | Make sure that group names are strings not integers
| * | | | | Make sure that group names are strings not integersJoas Schilling2015-11-062-1/+29
| | |/ / / | |/| | |
* | | | | Merge pull request #20288 from owncloud/fix_20234Thomas Müller2015-11-062-1/+109
|\ \ \ \ \ | |/ / / / |/| | | | make sure that we update the unencrypted size for the versions
| * | | | make sure that we update the unencrypted size for the versionsBjörn Schießle2015-11-042-1/+109
| | | | |
* | | | | Merge pull request #20271 from owncloud/fix-18701Thomas Müller2015-11-062-20/+149
|\ \ \ \ \ | |_|_|/ / |/| | | | LDAP: attempt to connect to backup server again, if main server is no…
| * | | | integration testsArthur Schiwon2015-11-041-0/+118
| | | | |
| * | | | LDAP: attempt to connect to backup server again, if main server is not ↵Arthur Schiwon2015-11-031-20/+31
| | | | | | | | | | | | | | | | | | | | available. Fixes #18701
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-068-0/+56
| | | | |
* | | | | Merge pull request #19872 from owncloud/share2.0_sharemanagerThomas Müller2015-11-0513-5/+2232
|\ \ \ \ \ | | | | | | | | | | | | Share2.0 sharemanager
| * | | | | Fix oracleRoeland Jago Douma2015-11-051-35/+119
| | | | | |
| * | | | | Add unshare hooksRoeland Jago Douma2015-11-054-103/+187
| | | | | |
| * | | | | Use the old code for remote shares for nowRoeland Jago Douma2015-11-051-0/+8
| | | | | |
| * | | | | The new sharing code now handles deletionRoeland Jago Douma2015-11-0512-106/+1469
| | | | | | | | | | | | | | | | | | | | | | | | OCS -> ShareManager -> DefaultShareProvider
| * | | | | Prepare OCS Share endpointRoeland Jago Douma2015-11-052-5/+70
| | | | | |
| * | | | | Initial setup of shareing 2.0 sharemanager and shareRoeland Jago Douma2015-11-053-0/+623
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added sharemanager class This is the central class where all API calls talk to (OCS/Activity). This in turn talks to the share providers to get the actual sharing done. It uses all ShareObjects * Added share class Simple class to hold all the share properties that is passed around * Added IShareProvider interface Interface that providers os a share have to implement.
* | | | | Merge pull request #20339 from owncloud/header-not-boldLukas Reschke2015-11-051-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | do not bold heading of update screen
| * | | | do not bold header of update screenJan-Christoph Borchardt2015-11-051-2/+2
|/ / / /
* | | | Merge pull request #20273 from owncloud/sharing-api-adding-testsThomas Müller2015-11-052-0/+203
|\ \ \ \ | | | | | | | | | | Adding more tests to the sharing API.
| * \ \ \ Merge branch 'master' into sharing-api-adding-testsSergio Bertolín2015-11-0594-294/+686
| |\ \ \ \
| * | | | | Added changes in the verification of sharing get responsesSergio Bertolin2015-11-052-2/+37
| | | | | |
| * | | | | added test for deleting a shareSergio Bertolin2015-11-042-1/+19
| | | | | |
| * | | | | Added general function to create shares in preconditions.Sergio Bertolin2015-11-042-7/+97
| | | | | |
| * | | | | enhancements to pre and post conditionsSergio Bertolin2015-11-031-0/+60
| | |_|_|/ | |/| | |
* | | | | Merge pull request #20325 from owncloud/subadmin-handle-nullThomas Müller2015-11-052-6/+47
|\ \ \ \ \ | |_|/ / / |/| | | | subadmin methods should not return any null user or group
| * | | | subadmin methods should not return any null user or groupArthur Schiwon2015-11-052-6/+47
| | | | |
* | | | | Merge pull request #20301 from owncloud/fix-files_external-empty-user-mountingThomas Müller2015-11-051-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | [files_external] fix empty user mounts setting
| * | | | [files_external] fix empty user mounts settingMorris Jobke2015-11-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | * fixes #19858 * if no backend is allowed to be mounted also the user mount setting should be disabled
* | | | | Merge pull request #20320 from owncloud/drop-file_mapThomas Müller2015-11-052-61/+1
|\ \ \ \ \ | | | | | | | | | | | | Drop unused table file_map
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 23:07:50 +0000