| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #20333 from owncloud/fix-18956 | Thomas Müller | 2015-11-10 | 7 | -12/+26 |
| |\ | | | | | [LDAP Wizard] make all the buttons beautiful | ||||
| | * | make all the buttons beautiful | Arthur Schiwon | 2015-11-05 | 7 | -12/+26 |
| | | | |||||
| * | | Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirement | Thomas Müller | 2015-11-10 | 2 | -0/+19 |
| |\ \ | | | | | | | Do not allow two different version requirements | ||||
| | * | | Do not allow two different version requirements | Joas Schilling | 2015-11-09 | 2 | -0/+19 |
| | | | | |||||
| * | | | Merge pull request #20403 from owncloud/fix_19788 | Thomas Müller | 2015-11-10 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Fix Error message when sharing outside of group | ||||
| | * | | | Fix Error message when sharing outside of group | Roeland Jago Douma | 2015-11-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | For #19788 | ||||
| * | | | | Merge pull request #20404 from owncloud/fix_autoloader_tests | Thomas Müller | 2015-11-10 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | Fix autoloader unit test output | ||||
| | * | | | | Fix autoloader unit test output | Roeland Jago Douma | 2015-11-09 | 1 | -1/+0 |
| | |/ / / | | | | | | | | | | | | | Removed leftover print statement | ||||
| * | | | | Merge pull request #20397 from owncloud/fix-carddav-lookup | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
| |\ \ \ \ | |/ / / |/| | | | Register DAVACL plugin to provide current-user-principal | ||||
| | * | | | Register DAVACL plugin to provide current-user-principal | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge pull request #20351 from ↵ | Thomas Müller | 2015-11-09 | 3 | -3/+58 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/sharing-api-integration-tests-getting-shares Added tests about getting shares of a file and a test for deleting a … | ||||
| | * | | | Added tests about getting shares of a file and a test for deleting a user ↵ | Sergio Bertolin | 2015-11-06 | 3 | -3/+58 |
| | | | | | | | | | | | | | | | | | from a group which doesn't exist | ||||
| * | | | | Merge pull request #20236 from maprambo/safari-pinned-tab-icon | Thomas Müller | 2015-11-09 | 4 | -0/+5 |
| |\ \ \ \ | | | | | | | | | | | added Safari tabbed pin icon | ||||
| | * | | | | Added Safari tabbed pin icon | maprambo | 2015-11-04 | 4 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | Added the necessary code and a black and inverted version of the favicon/ touch icon in svg format | ||||
| * | | | | | Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval | Thomas Müller | 2015-11-09 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Force approval in GDrive oauth to get refresh_token | ||||
| | * | | | | | Force approval in GDrive oauth to get refresh_token | Vincent Petry | 2015-11-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing the approval of app permissions makes sure that the GDrive API will always return a refresh_token. In the case of apps that were already authorized for the current user/domain, the API doesn't return the refresh_token which causes expiration issues. | ||||
| * | | | | | | Merge pull request #20383 from owncloud/fix-setupchecks-messages | Thomas Müller | 2015-11-09 | 1 | -28/+36 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Properly detect setup check messages set in the HTML template | ||||
| | * | | | | | Properly detect setup check messages set in the HTML template | Robin McCorkell | 2015-11-08 | 1 | -28/+36 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-09 | 4 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-08 | 20 | -70/+102 |
| |/ / / / / | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-07 | 4 | -2/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #20184 from owncloud/add-carddav | Thomas Müller | 2015-11-06 | 26 | -23/+1056 |
| |\ \ \ \ \ | | | | | | | | | | | | | Introducing CardDAV into core | ||||
| | * | | | | | adding individual phpunit.xml and bootstrap.php | Thomas Müller | 2015-11-06 | 2 | -0/+38 |
| | | | | | | | |||||
| | * | | | | | Adding occ command to create an addressbook | Thomas Müller | 2015-11-06 | 2 | -0/+60 |
| | | | | | | | |||||
| | * | | | | | Introducing CardDAV into core | Thomas Müller | 2015-11-06 | 22 | -23/+958 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #20365 from owncloud/autoloader-fix | Thomas Müller | 2015-11-06 | 3 | -22/+69 |
| |\ \ \ \ \ | | | | | | | | | | | | | [autoloader] Make sure to load full paths | ||||
| | * | | | | | [autoloader] Make sure to load construct full paths | Roeland Jago Douma | 2015-11-06 | 3 | -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-ie10 | Thomas Müller | 2015-11-06 | 5 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add favicon for IE8-10 | ||||
| | * | | | | | update example theme favicon | Morris Jobke | 2015-11-03 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | Add favicon for IE 8+ | Morris Jobke | 2015-11-03 | 4 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #20350 from owncloud/add-log-statement-for-cron | Thomas Müller | 2015-11-06 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add debug log statement for IJobList steps in cron.php | ||||
| | * | | | | | Add debug log statement for IJobList steps in cron.php | Morris Jobke | 2015-11-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * makes debugging easier | ||||
| * | | | | | | Merge pull request #20346 from owncloud/show-language-code-for-unknown-languages | Thomas Müller | 2015-11-06 | 1 | -0/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Show the language code in personal settings for unknown languages | ||||
| | * | | | | | | Show the language code in personal settings for unknown languages | Morris Jobke | 2015-11-06 | 1 | -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-properlythrowexception | Thomas Müller | 2015-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Properly throw exception in OC_Mount_Config::getBackendStatus | ||||
| | * | | | | | | | Properly throw exception in OC_Mount_Config::getBackendStatus | Vincent Petry | 2015-11-06 | 1 | -1/+1 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #20359 from owncloud/mark-files-drop-as-shipped | Thomas Müller | 2015-11-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Mark files_drop as shipped | ||||
| | * | | | | | | Mark files_drop as shipped | Lukas Reschke | 2015-11-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/enterprise/issues/895 | ||||
| * | | | | | | | Merge pull request #20340 from owncloud/fix-ocs-error-code | Thomas Müller | 2015-11-06 | 2 | -2/+17 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Revert OCS error code change from #20135 | ||||
| | * | | | | | | Revert OCS error code change from #20135 | Joas Schilling | 2015-11-05 | 2 | -2/+17 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #20348 from owncloud/issue-20303-integer-group-names | Thomas Müller | 2015-11-06 | 2 | -1/+29 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make sure that group names are strings not integers | ||||
| | * | | | | | | | Make sure that group names are strings not integers | Joas Schilling | 2015-11-06 | 2 | -1/+29 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #20288 from owncloud/fix_20234 | Thomas Müller | 2015-11-06 | 2 | -1/+109 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | make sure that we update the unencrypted size for the versions | ||||
| | * | | | | | | make sure that we update the unencrypted size for the versions | Björn Schießle | 2015-11-04 | 2 | -1/+109 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #20271 from owncloud/fix-18701 | Thomas Müller | 2015-11-06 | 2 | -20/+149 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | LDAP: attempt to connect to backup server again, if main server is no… | ||||
| | * | | | | | | integration tests | Arthur Schiwon | 2015-11-04 | 1 | -0/+118 |
| | | | | | | | | |||||
| | * | | | | | | LDAP: attempt to connect to backup server again, if main server is not ↵ | Arthur Schiwon | 2015-11-03 | 1 | -20/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available. Fixes #18701 | ||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-06 | 8 | -0/+56 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #19872 from owncloud/share2.0_sharemanager | Thomas Müller | 2015-11-05 | 13 | -5/+2232 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Share2.0 sharemanager | ||||
| | * | | | | | | | Fix oracle | Roeland Jago Douma | 2015-11-05 | 1 | -35/+119 |
| | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |