summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22950 from owncloud/fixsharemountrecursionRoeland Douma2016-03-083-3/+10
|\
| * Fix share mounting recursionVincent Petry2016-03-083-3/+10
|/
* Merge pull request #22936 from owncloud/fix-group-share-migration-for-calenda...Thomas Müller2016-03-085-18/+31
|\
| * Fix group sharing and sharing permissions - fixes #22932Thomas Müller2016-03-085-18/+31
* | Merge pull request #22814 from owncloud/delete-empty-fileThomas Müller2016-03-081-0/+0
|\ \ | |/ |/|
| * Delete empty fileLukas Reschke2016-03-031-0/+0
* | Merge pull request #22800 from owncloud/fix-20536Thomas Müller2016-03-081-0/+3
|\ \
| * | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-031-0/+3
* | | Merge pull request #22885 from owncloud/master-show-version-to-update-toThomas Müller2016-03-082-3/+6
|\ \ \
| * | | Show version to update to properlyLukas Reschke2016-03-052-3/+6
* | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_apiThomas Müller2016-03-081-57/+37
|\ \ \ \
| * | | | Can't convert node to stringRoeland Jago Douma2016-03-071-1/+6
| * | | | Move common code to functionRoeland Jago Douma2016-03-071-56/+31
* | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-nameThomas Müller2016-03-081-4/+0
|\ \ \ \ \
| * | | | | Remove double URL encodingLukas Reschke2016-03-071-4/+0
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0836-24/+130
* | | | | | Merge pull request #22921 from owncloud/add-before-commandThomas Müller2016-03-071-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Initialize submodules for Scrutinizer as wellLukas Reschke2016-03-071-0/+3
|/ / / / /
* | | | | Merge pull request #22880 from owncloud/fix-21656Thomas Müller2016-03-072-1/+4
|\ \ \ \ \
| * | | | | improve log output when no LDAP user was found on login attemptArthur Schiwon2016-03-052-1/+4
* | | | | | Merge pull request #22911 from owncloud/fix-failing-migrationThomas Müller2016-03-076-28/+68
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Calendar and addressbook migration commands are always availableThomas Müller2016-03-071-10/+2
| * | | | | Handle addressbook migration issue by writing the faulty event to the log and...Thomas Müller2016-03-073-7/+32
| * | | | | Handle calendar migration issue by writing the faulty event to the log and co...Thomas Müller2016-03-073-11/+34
* | | | | | Merge pull request #22900 from owncloud/diskfreespace-filesworkaroundThomas Müller2016-03-071-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix call to disk_free_space when a file is providedVincent Petry2016-03-071-1/+9
* | | | | | Merge pull request #22902 from owncloud/share-archivenamedownloadallThomas Müller2016-03-072-3/+5
|\ \ \ \ \ \
| * | | | | | Remove "files" arg from download URL in public link pageVincent Petry2016-03-071-2/+4
| * | | | | | Fix archive file name when downloading public shareVincent Petry2016-03-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlim...Thomas Müller2016-03-071-1/+1
|\ \ \ \ \ \
| * | | | | | Fix uploading when free space is unlimitedVincent Petry2016-03-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #22872 from owncloud/password-change-tooltip-textThomas Müller2016-03-071-0/+2
|\ \ \ \ \ \
| * | | | | | Update error text for link passwordsMorris Jobke2016-03-041-0/+2
* | | | | | | Merge pull request #22815 from prastut/feature-enhance-loginflowThomas Müller2016-03-071-0/+11
|\ \ \ \ \ \ \
| * | | | | | | trigger login if remember_login checkedprastut2016-03-041-0/+11
* | | | | | | | Merge pull request #22812 from owncloud/node-lockThomas Müller2016-03-072-0/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Add locking to the node apiRobin Appelman2016-03-032-0/+75
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #22787 from owncloud/versions-fixmtimetooltipThomas Müller2016-03-071-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix tooltip for versions mtimeVincent Petry2016-03-021-1/+3
* | | | | | | | | Merge pull request #22785 from owncloud/trash-returnfalseon401Thomas Müller2016-03-072-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return false on 401 in file list + trash file listVincent Petry2016-03-032-0/+8
| |/ / / / / / / /
* | | | | | | | | Merge pull request #22896 from owncloud/fix-v1-carddav-endpointThomas Müller2016-03-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly default to null and add type hintJoas Schilling2016-03-071-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22904 from owncloud/get-user-groups-should-return-an-arrayThomas Müller2016-03-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure that the return value is an arrayJoas Schilling2016-03-071-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #22244 from owncloud/dont-update-shared-resource-propertiesThomas Müller2016-03-075-3/+84
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Allow to change properties of readonly calendarsJoas Schilling2016-02-291-0/+8
| * | | | | | | | Allow to hide a shared calendarJoas Schilling2016-02-292-4/+29
| * | | | | | | | For 9.0 we don't have the possibility to store calendar and addressbook prope...Thomas Müller2016-02-294-3/+51
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0758-8/+448