summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10051 from owncloud/preview-empty-textThomas Müller2014-07-315-4/+71
|\ | | | | Use svg mimeicons for empty text files
| * Use svg mimeicons for empty text filesRobin Appelman2014-07-305-4/+71
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-315-0/+39
| |
* | Merge pull request #10044 from owncloud/transparency_fixJan-Christoph Borchardt2014-07-301-0/+8
|\ \ | | | | | | extract transparency fix from #8050
| * | extract transparency fix from #8050Georg Ehrke2014-07-301-0/+8
| | |
* | | Merge pull request #10029 from owncloud/fix-thirdpartyMorris Jobke2014-07-301-11/+16
|\ \ \ | | | | | | | | Fix silent crash if 3rdparty dir is not available
| * | | Replace exit with returnVictor Dubiniuk2014-07-301-1/+1
| | | |
| * | | Fix silent crash if 3rdparty dir is not availableVictor Dubiniuk2014-07-301-11/+16
| | | |
* | | | Merge pull request #10024 from owncloud/preview-restrict-heightMorris Jobke2014-07-301-2/+8
|\ \ \ \ | | | | | | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratio
| * | | | Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-301-2/+8
| |/ / /
* | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoloadJörn Friedrich Dreyer2014-07-302-11/+22
|\ \ \ \ | |_|/ / |/| | | Cache factory needs to use globalPrefix in createLowLatency()
| * | | Add registerAutoloaderCache().Andreas Fischer2014-07-291-15/+18
| | | |
| * | | Memcache\Factory: Remove static, use globalPrefix.Andreas Fischer2014-07-292-4/+14
| | | |
| * | | InstanceId is properly injected into factory. Remove comment.Andreas Fischer2014-07-291-2/+0
| | | |
* | | | Merge pull request #9970 from owncloud/sharing_set_expire_dateMorris Jobke2014-07-301-1/+2
|\ \ \ \ | |_|/ / |/| | | Sharing set expire date
| * | | 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'
| * | | | 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' templates
| * | | | 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 sharing
| * | 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
|\ | | | | [share api] add OCS api call to set expire date for link shares
| * 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 directory
| * | 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 events
| * | | 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 Preview
| * | | | Cleanup Document Previewjosh4trunks2014-07-221-3/+2
| | |_|/ | |/| | | | | | | | | | Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php. This will stop the creating of multiple directories for document conversion in tmpDir.
* | | | Merge pull request #9641 from owncloud/localuser-addressbookThomas Müller2014-07-282-0/+113
|\ \ \ \ | | | | | | | | | | ownCloud users are exported as address book
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | update getID3 library
| * | | | | 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 update
| * | | | | Set version AFTER a successful updateVincent Petry2014-07-231-2/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app upgrade failed, the core version will not be increased either in the database. This will re-display the update page and make it possible to redo the apps upgrade. Note that any core repair routine must take into account that an update might need to be redone again even though the core's DB state is already the one of the new version.
* | | | | Merge pull request #9859 from tiezdne/masterThomas Müller2014-07-281-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Update mimetypes.list.php
| * | | | | 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 exist
| * | | | | | 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 valid
| * | | | | Verify whether the URL is validLukas Reschke2014-07-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017 @karlitschek Backport for stable6 and stable7 requested.
* | | | | | Merge pull request #9904 from owncloud/loggedout-getuserfolderThomas Müller2014-07-281-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont throw an error when calling $server->getUserFolder when logged out
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | don't silently exit in cli-mode in case ownCloud in not yet installed
| * | | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 19:04:12 +0000