summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* | | | | | | Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-ownc...Thomas Müller2016-03-061-2/+19
|\ \ \ \ \ \ \
| * | | | | | | Cache results of testRemoteUrlLukas Reschke2016-03-041-2/+19
* | | | | | | | Merge pull request #22807 from owncloud/remove-empty-translationsThomas Müller2016-03-0632-240/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | ne, or_IN, uz and yo have been removed from transifex and will be removed fro...Thomas Müller2016-03-0332-240/+0
* | | | | | | | | Merge pull request #22888 from owncloud/use-custom-headerThomas Müller2016-03-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use custom headerLukas Reschke2016-03-051-1/+1
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0618-0/+58
|/ / / / / / / / /
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-05146-178/+592
* | | | | | | | | Merge pull request #22878 from owncloud/use-clob-for-timezoneC. Montero Luque2016-03-042-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Use CLOB for timezoneLukas Reschke2016-03-042-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #22870 from owncloud/autoenable-federation-appC. Montero Luque2016-03-042-11/+13
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into autoenable-federation-appC. Montero Luque2016-03-041-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adjust OCS testLukas Reschke2016-03-041-0/+1
| * | | | | | | | | Automatically enable "federation" appLukas Reschke2016-03-041-11/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22865 from owncloud/fix-db-locking-cleanupC. Montero Luque2016-03-045-16/+71
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |