Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22950 from owncloud/fixsharemountrecursion | Roeland Douma | 2016-03-08 | 3 | -3/+10 |
|\ | |||||
| * | Fix share mounting recursion | Vincent Petry | 2016-03-08 | 3 | -3/+10 |
|/ | |||||
* | Merge pull request #22936 from owncloud/fix-group-share-migration-for-calenda... | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
|\ | |||||
| * | Fix group sharing and sharing permissions - fixes #22932 | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
* | | Merge pull request #22814 from owncloud/delete-empty-file | Thomas Müller | 2016-03-08 | 1 | -0/+0 |
|\ \ | |/ |/| | |||||
| * | Delete empty file | Lukas Reschke | 2016-03-03 | 1 | -0/+0 |
* | | Merge pull request #22800 from owncloud/fix-20536 | Thomas Müller | 2016-03-08 | 1 | -0/+3 |
|\ \ | |||||
| * | | don't hide server not available exception, fixes #20536 | Arthur Schiwon | 2016-03-03 | 1 | -0/+3 |
* | | | Merge pull request #22885 from owncloud/master-show-version-to-update-to | Thomas Müller | 2016-03-08 | 2 | -3/+6 |
|\ \ \ | |||||
| * | | | Show version to update to properly | Lukas Reschke | 2016-03-05 | 2 | -3/+6 |
* | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_api | Thomas Müller | 2016-03-08 | 1 | -57/+37 |
|\ \ \ \ | |||||
| * | | | | Can't convert node to string | Roeland Jago Douma | 2016-03-07 | 1 | -1/+6 |
| * | | | | Move common code to function | Roeland Jago Douma | 2016-03-07 | 1 | -56/+31 |
* | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-name | Thomas Müller | 2016-03-08 | 1 | -4/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove double URL encoding | Lukas Reschke | 2016-03-07 | 1 | -4/+0 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-08 | 36 | -24/+130 |
* | | | | | | Merge pull request #22921 from owncloud/add-before-command | Thomas Müller | 2016-03-07 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Initialize submodules for Scrutinizer as well | Lukas Reschke | 2016-03-07 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #22880 from owncloud/fix-21656 | Thomas Müller | 2016-03-07 | 2 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | improve log output when no LDAP user was found on login attempt | Arthur Schiwon | 2016-03-05 | 2 | -1/+4 |
* | | | | | | Merge pull request #22911 from owncloud/fix-failing-migration | Thomas Müller | 2016-03-07 | 6 | -28/+68 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Calendar and addressbook migration commands are always available | Thomas Müller | 2016-03-07 | 1 | -10/+2 |
| * | | | | | Handle addressbook migration issue by writing the faulty event to the log and... | Thomas Müller | 2016-03-07 | 3 | -7/+32 |
| * | | | | | Handle calendar migration issue by writing the faulty event to the log and co... | Thomas Müller | 2016-03-07 | 3 | -11/+34 |
* | | | | | | Merge pull request #22900 from owncloud/diskfreespace-filesworkaround | Thomas Müller | 2016-03-07 | 1 | -1/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix call to disk_free_space when a file is provided | Vincent Petry | 2016-03-07 | 1 | -1/+9 |
* | | | | | | Merge pull request #22902 from owncloud/share-archivenamedownloadall | Thomas Müller | 2016-03-07 | 2 | -3/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove "files" arg from download URL in public link page | Vincent Petry | 2016-03-07 | 1 | -2/+4 |
| * | | | | | | Fix archive file name when downloading public share | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlim... | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix uploading when free space is unlimited | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22872 from owncloud/password-change-tooltip-text | Thomas Müller | 2016-03-07 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update error text for link passwords | Morris Jobke | 2016-03-04 | 1 | -0/+2 |
* | | | | | | | Merge pull request #22815 from prastut/feature-enhance-loginflow | Thomas Müller | 2016-03-07 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | trigger login if remember_login checked | prastut | 2016-03-04 | 1 | -0/+11 |
* | | | | | | | | Merge pull request #22812 from owncloud/node-lock | Thomas Müller | 2016-03-07 | 2 | -0/+75 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add locking to the node api | Robin Appelman | 2016-03-03 | 2 | -0/+75 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #22787 from owncloud/versions-fixmtimetooltip | Thomas Müller | 2016-03-07 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix tooltip for versions mtime | Vincent Petry | 2016-03-02 | 1 | -1/+3 |
* | | | | | | | | | Merge pull request #22785 from owncloud/trash-returnfalseon401 | Thomas Müller | 2016-03-07 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Return false on 401 in file list + trash file list | Vincent Petry | 2016-03-03 | 2 | -0/+8 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Correctly default to null and add type hint | Joas Schilling | 2016-03-07 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #22904 from owncloud/get-user-groups-should-return-an-array | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make sure that the return value is an array | Joas Schilling | 2016-03-07 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #22244 from owncloud/dont-update-shared-resource-properties | Thomas Müller | 2016-03-07 | 5 | -3/+84 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Allow to change properties of readonly calendars | Joas Schilling | 2016-02-29 | 1 | -0/+8 |
| * | | | | | | | | Allow to hide a shared calendar | Joas Schilling | 2016-02-29 | 2 | -4/+29 |
| * | | | | | | | | For 9.0 we don't have the possibility to store calendar and addressbook prope... | Thomas Müller | 2016-02-29 | 4 | -3/+51 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-07 | 58 | -8/+448 |