summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* extract transparency fix from #8050Georg Ehrke2014-07-301-0/+8
* Merge pull request #9970 from owncloud/sharing_set_expire_dateMorris Jobke2014-07-301-1/+2
|\
| * make sure that we set the expire date if a date is adefault date is setBjoern Schiessle2014-07-281-1/+2
* | Merge pull request #9888 from owncloud/mysql-tinyint-masterThomas Müller2014-07-301-0/+13
|\ \
| * | migration test for sqlite - adding type mapping for 'tinyint unsigned'Thomas Müller2014-07-291-0/+13
* | | Merge pull request #9914 from owncloud/fix-appframework-blank-templateThomas Müller2014-07-301-1/+3
|\ \ \
| * | | Fix template rendering for 'blank' templatesMorris Jobke2014-07-291-1/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-3015-0/+34
|/ / /
* | | Merge pull request #9988 from owncloud/sharing_remove_share_permissionBjörn Schießle2014-07-291-1/+1
|\ \ \ | |/ / |/| |
| * | remove share permission if user is excluded from sharingBjoern Schiessle2014-07-291-1/+1
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2014-07-292-1/+14
|/
* Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-284-9/+83
|\
| * add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-254-9/+83
* | Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hosterMorris Jobke2014-07-282-2/+27
|\ \
| * | generate copy of sqlite database file in data directoryThomas Müller2014-07-282-2/+27
* | | Merge pull request #9924 from owncloud/eventsource-nginx-bufferingRobin Appelman2014-07-281-0/+2
|\ \ \
| * | | Prevent nginx from buffering event source eventsRobin Appelman2014-07-261-0/+2
* | | | Merge pull request #9784 from josh4trunks/libreoffice_match_clThomas Müller2014-07-281-3/+2
|\ \ \ \
| * | | | Cleanup Document Previewjosh4trunks2014-07-221-3/+2
| | |_|/ | |/| |
* | | | Merge pull request #9641 from owncloud/localuser-addressbookThomas Müller2014-07-282-0/+113
|\ \ \ \
| * | | | ownCloud users are exported as address bookThomas Müller2014-07-242-0/+113
* | | | | Merge pull request #9631 from owncloud/update-getid3Thomas Müller2014-07-281-2/+0
|\ \ \ \ \
| * | | | | add autoloadMorris Jobke2014-07-251-2/+0
| * | | | | update getID3 libraryMorris Jobke2014-07-251-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #9819 from owncloud/updater-setversionafterupdateThomas Müller2014-07-281-2/+3
|\ \ \ \ \
| * | | | | Set version AFTER a successful updateVincent Petry2014-07-231-2/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #9859 from tiezdne/masterThomas Müller2014-07-281-0/+2
|\ \ \ \ \
| * | | | | Update mimetypes.list.phptiezdne2014-07-241-0/+2
* | | | | | Merge pull request #9905 from owncloud/joblist-non-existing-classThomas Müller2014-07-281-1/+4
|\ \ \ \ \ \
| * | | | | | Dont try to execute jobs that no longer existRobin Appelman2014-07-251-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9935 from owncloud/harden-get-urlcoThomas Müller2014-07-281-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Verify whether the URL is validLukas Reschke2014-07-271-0/+5
* | | | | | Merge pull request #9904 from owncloud/loggedout-getuserfolderThomas Müller2014-07-281-1/+5
|\ \ \ \ \ \
| * | | | | | Dont throw an error when calling $server->getUserFolder when logged outRobin Appelman2014-07-251-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-masterThomas Müller2014-07-281-7/+9
|\ \ \ \ \ \
| * | | | | | reorder if statements to remove negation, indentation correctionJörn Friedrich Dreyer2014-07-251-9/+9
| * | | | | | don't silently exit in cli-mode in case ownCloud in not yet installedThomas Müller2014-07-241-0/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-281-0/+2
| |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-274-6/+26
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-263-2/+34
* | | | | | Merge pull request #9669 from owncloud/group-publicRobin Appelman2014-07-257-48/+235
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add group management to the public apiRobin Appelman2014-07-167-48/+235
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-251-0/+15
* | | | | | Merge pull request #9841 from owncloud/fix-password-reset-masterThomas Müller2014-07-242-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | - adding default value for $recoveryPasswordThomas Müller2014-07-242-4/+4
| | |/ / / | |/| | |
* / | | | register type mappings for unknown/unsupported mysql typesThomas Müller2014-07-241-0/+4
|/ / / /
* | / / only commit in case a transaction is activeThomas Müller2014-07-231-1/+3
| |/ / |/| |
* | | Revert changeSander2014-07-221-2/+2
* | | Allow getAppFolder to get another apps pathSander2014-07-221-3/+2
* | | Merge pull request #9772 from owncloud/fix-chunked-upload-master-2Thomas Müller2014-07-221-0/+31
|\ \ \