Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date | Björn Schießle | 2014-07-28 | 2 | -7/+71 |
|\ | |||||
| * | add OCS api call to set expire date for link shares | Bjoern Schiessle | 2014-07-25 | 2 | -7/+71 |
* | | Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster | Morris Jobke | 2014-07-28 | 2 | -2/+27 |
|\ \ | |||||
| * | | generate copy of sqlite database file in data directory | Thomas Müller | 2014-07-28 | 2 | -2/+27 |
* | | | Merge pull request #9924 from owncloud/eventsource-nginx-buffering | Robin Appelman | 2014-07-28 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Prevent nginx from buffering event source events | Robin Appelman | 2014-07-26 | 1 | -0/+2 |
* | | | | Merge pull request #9784 from josh4trunks/libreoffice_match_cl | Thomas Müller | 2014-07-28 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | Cleanup Document Preview | josh4trunks | 2014-07-22 | 1 | -3/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #9641 from owncloud/localuser-addressbook | Thomas Müller | 2014-07-28 | 1 | -0/+104 |
|\ \ \ \ | |||||
| * | | | | ownCloud users are exported as address book | Thomas Müller | 2014-07-24 | 1 | -0/+104 |
* | | | | | Merge pull request #9631 from owncloud/update-getid3 | Thomas Müller | 2014-07-28 | 1 | -2/+0 |
|\ \ \ \ \ | |||||
| * | | | | | add autoload | Morris Jobke | 2014-07-25 | 1 | -2/+0 |
| * | | | | | update getID3 library | Morris Jobke | 2014-07-25 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #9819 from owncloud/updater-setversionafterupdate | Thomas Müller | 2014-07-28 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Set version AFTER a successful update | Vincent Petry | 2014-07-23 | 1 | -2/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #9859 from tiezdne/master | Thomas Müller | 2014-07-28 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Update mimetypes.list.php | tiezdne | 2014-07-24 | 1 | -0/+2 |
* | | | | | | Merge pull request #9905 from owncloud/joblist-non-existing-class | Thomas Müller | 2014-07-28 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Dont try to execute jobs that no longer exist | Robin Appelman | 2014-07-25 | 1 | -1/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #9935 from owncloud/harden-get-urlco | Thomas Müller | 2014-07-28 | 1 | -0/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Verify whether the URL is valid | Lukas Reschke | 2014-07-27 | 1 | -0/+5 |
* | | | | | | Merge pull request #9904 from owncloud/loggedout-getuserfolder | Thomas Müller | 2014-07-28 | 1 | -1/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Dont throw an error when calling $server->getUserFolder when logged out | Robin Appelman | 2014-07-25 | 1 | -1/+5 |
| |/ / / / | |||||
* | | | | | Merge pull request #9669 from owncloud/group-public | Robin Appelman | 2014-07-25 | 4 | -48/+64 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add group management to the public api | Robin Appelman | 2014-07-16 | 4 | -48/+64 |
* | | | | | Merge pull request #9841 from owncloud/fix-password-reset-master | Thomas Müller | 2014-07-24 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | - adding default value for $recoveryPassword | Thomas Müller | 2014-07-24 | 1 | -1/+1 |
* | | | | | register type mappings for unknown/unsupported mysql types | Thomas Müller | 2014-07-24 | 1 | -0/+4 |
|/ / / / | |||||
* | / / | only commit in case a transaction is active | Thomas Müller | 2014-07-23 | 1 | -1/+3 |
| |/ / |/| | | |||||
* | | | Revert change | Sander | 2014-07-22 | 1 | -2/+2 |
* | | | Allow getAppFolder to get another apps path | Sander | 2014-07-22 | 1 | -3/+2 |
* | | | adding special handling of checkPrecondition() for chunked upload | Thomas Müller | 2014-07-22 | 1 | -0/+31 |
* | | | perm -> permissions | Thomas Müller | 2014-07-21 | 1 | -1/+1 |
* | | | Merge pull request #9406 from philfry/master | Vincent Petry | 2014-07-21 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | silently discard the response body, needed for apache/mod_dav and maybe other... | Philippe Kueck | 2014-07-03 | 1 | -0/+1 |
* | | | | Merge pull request #9672 from owncloud/mysql-affectedrows | Andreas Fischer | 2014-07-20 | 1 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | Document why we have to check with defined() first. | Andreas Fischer | 2014-07-16 | 1 | -0/+2 |
| * | | | | Make MySQL return "number of found rows" instead of number of "affected rows". | Andreas Fischer | 2014-07-16 | 1 | -1/+7 |
* | | | | | update appstore api url | Frank Karlitschek | 2014-07-17 | 1 | -1/+1 |
* | | | | | Fix renaming files in the root folder of a MappedLocal storage | Robin Appelman | 2014-07-16 | 1 | -2/+17 |
* | | | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstream | icewind1991 | 2014-07-16 | 2 | -4/+22 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | files: storage: rename should check parent directories of old and new files | Tigran Mkrtchyan | 2014-07-10 | 2 | -4/+22 |
* | | | | | Port of #9584 | Stephan Peijnik | 2014-07-16 | 1 | -1/+15 |
* | | | | | Merge pull request #9640 from owncloud/fix_9627 | Björn Schießle | 2014-07-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | make sure that 'OC_Theme' exists before checking if the method exists | Bjoern Schiessle | 2014-07-15 | 1 | -1/+1 |
* | | | | | | Merge pull request #9644 from owncloud/fix_user_api | Thomas Müller | 2014-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | use UserSession service to resolve user id | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -1/+1 |
* | | | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_results | blizzz | 2014-07-15 | 1 | -33/+22 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | mkae getRelativePath of file search results overwriteable in subclasses | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -2/+1 |
| * | | | | | return relative path | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -27/+15 |