Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-10 | 2 | -0/+2 |
| | |||||
* | 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 |
| | | |||||
* | | Register DAVACL plugin to provide current-user-principal | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
| | | |||||
* | | 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. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-09 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-08 | 10 | -60/+66 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-07 | 2 | -0/+2 |
| | | | |||||
* | | | 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 #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 #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 #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 | 4 | -0/+10 |
| | | | |||||
* | | | Use the old code for remote shares for now | Roeland Jago Douma | 2015-11-05 | 1 | -0/+8 |
| | | | |||||
* | | | The new sharing code now handles deletion | Roeland Jago Douma | 2015-11-05 | 3 | -3/+196 |
| | | | | | | | | | | | | OCS -> ShareManager -> DefaultShareProvider | ||||
* | | | Prepare OCS Share endpoint | Roeland Jago Douma | 2015-11-05 | 2 | -5/+70 |
| |/ |/| | |||||
* | | Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting | Thomas Müller | 2015-11-05 | 1 | -0/+5 |
|\ \ | | | | | | | [files_external] fix empty user mounts setting | ||||
| * | | [files_external] fix empty user mounts setting | Morris Jobke | 2015-11-04 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | * fixes #19858 * if no backend is allowed to be mounted also the user mount setting should be disabled | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-05 | 28 | -26/+152 |
| | | | |||||
* | | | Merge pull request #20053 from owncloud/getfileinfo-locking | Thomas Müller | 2015-11-04 | 1 | -26/+26 |
|\ \ \ | | | | | | | | | Don't lock if we're only reading cache metadata | ||||
| * | | | Split checkUpdate | Robin Appelman | 2015-11-03 | 1 | -26/+26 |
| | |/ | |/| | |||||
* | | | add port to host only, if an URL is used instead of a plain hostname | Arthur Schiwon | 2015-11-04 | 1 | -3/+7 |
| |/ |/| | |||||
* | | Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage | Thomas Müller | 2015-11-04 | 1 | -1/+1 |
|\ \ | | | | | | | Correct the description of function setEncryptHomeStorage | ||||
| * | | Correct the description of function setEncryptHomeStorage | Phil Davis | 2015-11-03 | 1 | -1/+1 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-04 | 44 | -40/+176 |
|/ | |||||
* | Merge pull request #20223 from owncloud/fix-apply-webdav-tags | Thomas Müller | 2015-11-03 | 1 | -1/+1 |
|\ | | | | | Fix TagList namespace in property map | ||||
| * | Fix TagList namespace in property map | Vincent Petry | 2015-11-02 | 1 | -1/+1 |
| | | |||||
* | | fix external storage wording detail, ref #19858 | Jan-Christoph Borchardt | 2015-11-03 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-03 | 4 | -0/+8 |
| | | |||||
* | | Merge branch 'master' into fix-20151 | blizzz | 2015-11-02 | 36 | -12/+187 |
|\| | |||||
| * | Merge pull request #20192 from owncloud/fix-20090 | Thomas Müller | 2015-11-02 | 2 | -0/+12 |
| |\ | | | | | | | if a user that is flag as deleted shows up again, remove that flag. F… | ||||
| | * | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 | Arthur Schiwon | 2015-10-30 | 2 | -0/+12 |
| | | | |||||
| * | | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn | Thomas Müller | 2015-11-02 | 1 | -1/+3 |
| |\ \ | | | | | | | | | Fix scrollto= parameter in trashbin view | ||||
| | * | | Fix scrollto= parameter in trashbin view | Joas Schilling | 2015-11-02 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #20181 from owncloud/files-fixdownloadspinner | Thomas Müller | 2015-11-02 | 4 | -3/+101 |
| |\ \ \ | | |/ / | |/| | | Fix file action download spinner | ||||
| | * | | Fix file action download spinner | Vincent Petry | 2015-10-30 | 4 | -3/+101 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-02 | 8 | -8/+18 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-01 | 10 | -0/+38 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-31 | 12 | -0/+14 |
| | | | | |||||
| * | | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip | Thomas Müller | 2015-10-31 | 1 | -0/+1 |
| |\ \ \ | | |_|/ | |/| | | Add tooltip to ldap server wizard | ||||
| | * | | add tooltip to ldap server wizard | Hendrik Leppelsack | 2015-10-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | add method to count users by loginname and use it for diagnose test, fixes ↵ | Arthur Schiwon | 2015-10-30 | 5 | -3/+167 |
|/ / / | | | | | | | | | | #20151 | ||||
* | | | Merge pull request #20175 from owncloud/login-arrow | Thomas Müller | 2015-10-30 | 2 | -5/+0 |
|\ \ \ | | | | | | | | | remove unneeded icons from input fields to not distract from submit button, fix #18940 |