summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* don't display share permission if resharing was disabled by the adminBjoern Schiessle2014-08-051-1/+1
* Merge pull request #10151 from owncloud/issue/9912Morris Jobke2014-08-051-5/+5
|\
| * Increase word wrap limit for emails to 78 charactersJoas Schilling2014-08-041-5/+5
* | Merge pull request #10083 from th3fallen/fix-9969-take-twoJoas Schilling2014-08-042-37/+9
|\ \ | |/ |/|
| * Removing unnecessary switch statements in fopen methods.Clark Tomlinson2014-07-312-37/+9
* | Merge pull request #10025 from owncloud/l10n-typoThomas Müller2014-08-041-8/+8
|\ \
| * | expire -> expirationVolkan Gezer2014-08-021-6/+6
| * | suggestions by deepdiverVolkan Gezer2014-08-011-4/+4
| * | typo fix from transifex suggestionVolkan Gezer2014-07-301-2/+2
* | | fix return documentationJörn Friedrich Dreyer2014-08-011-7/+5
* | | prevent PHP errors and enhance loggingThomas Müller2014-08-011-1/+5
| |/ |/|
* | Merge pull request #10051 from owncloud/preview-empty-textThomas Müller2014-07-314-4/+64
|\ \
| * | Use svg mimeicons for empty text filesRobin Appelman2014-07-304-4/+64
* | | Merge pull request #10044 from owncloud/transparency_fixJan-Christoph Borchardt2014-07-301-0/+8
|\ \ \
| * | | extract transparency fix from #8050Georg Ehrke2014-07-301-0/+8
* | | | 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 ratioRobin Appelman2014-07-301-2/+8
| | |_|/ | |/| |
* | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoloadJörn Friedrich Dreyer2014-07-301-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Memcache\Factory: Remove static, use globalPrefix.Andreas Fischer2014-07-291-2/+3
* | | | 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
| |/
* / remove share permission if user is excluded from sharingBjoern Schiessle2014-07-291-1/+1
|/
* Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-282-7/+71
|\
| * add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-252-7/+71
* | 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-281-0/+104
|\ \ \ \
| * | | | ownCloud users are exported as address bookThomas Müller2014-07-241-0/+104
* | | | | 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 #9669 from owncloud/group-publicRobin Appelman2014-07-254-48/+64
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add group management to the public apiRobin Appelman2014-07-164-48/+64
* | | | | Merge pull request #9841 from owncloud/fix-password-reset-masterThomas Müller2014-07-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |