aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-29296-9598/+14775
|
* Merge pull request #9989 from owncloud/fix-failing-unit-test-masterThomas Müller2014-07-291-5/+5
|\ | | | | function declaration did not match
| * function declaration did not matchThomas Müller2014-07-291-5/+5
| |
* | Merge pull request #9945 from owncloud/remove-mssql-bundle-masterThomas Müller2014-07-281-0/+0
|\ \ | |/ |/| remove MssqlBundle
| * remove MssqlBundleThomas Müller2014-07-281-0/+0
|/
* Merge pull request #9758 from owncloud/share-expdatefixBjörn Schießle2014-07-284-15/+170
|\ | | | | Fix enforced share expiration date to be based on share time
| * Fix enforced share expiration date to be based on share timeVincent Petry2014-07-214-15/+170
| |
* | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-288-34/+225
|\ \ | | | | | | [share api] add OCS api call to set expire date for link shares
| * | adjust error codeBjoern Schiessle2014-07-281-2/+2
| | |
| * | add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-258-33/+224
| | |
* | | 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 #9853 from owncloud/design-mobile-searchMorris Jobke2014-07-284-5/+19
|\ \ \ \ \ | | | | | | | | | | | | improve look of search on mobile, save space in top bar, fix overlap
| * | | | | improve look of search on mobile, save space in top barJan-Christoph Borchardt2014-07-244-5/+19
| | | | | |
* | | | | | 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.
* | | | | | | update 3rdparty submodule to merge commitMorris Jobke2014-07-281-0/+0
| | | | | | |
* | | | | | | Merge pull request #9585 from owncloud/design-fix-public-footerJan-Christoph Borchardt2014-07-282-16/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | move public page footer rules from sharing app to core so it is used by other apps too
| * | | | | | | move public page footer rules from sharing app to core so it is used by ↵Jan-Christoph Borchardt2014-07-072-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other apps too
* | | | | | | | Merge pull request #9847 from owncloud/design-input-groupingJan-Christoph Borchardt2014-07-281-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | enable input grouping also outside of log in screen
| * | | | | | | | enable input grouping also outside of log in screenJan-Christoph Borchardt2014-07-241-3/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #9641 from owncloud/localuser-addressbookThomas Müller2014-07-283-0/+208
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | ownCloud users are exported as address book
| * | | | | | | | | ownCloud users are exported as address bookThomas Müller2014-07-243-0/+208
| | | | | | | | | |
* | | | | | | | | | Merge pull request #9631 from owncloud/update-getid3Thomas Müller2014-07-282-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | update getID3 library
| * | | | | | | | | | add autoloadMorris Jobke2014-07-252-2/+0
| | | | | | | | | | |
| * | | | | | | | | | update getID3 libraryMorris Jobke2014-07-252-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
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2842-152/+213
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #9922 from visit1985/app_icon_sizeJan-Christoph Borchardt2014-07-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | max icon size for app menu
| * | | | | | | | | | | max icon size for app menuMichael Göhler2014-07-261-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2750-364/+454
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2653-351/+446
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #9669 from owncloud/group-publicRobin Appelman2014-07-257-48/+235
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Add group management to the public api
| * | | | | | | | | | Add group management to the public apiRobin Appelman2014-07-167-48/+235
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #9867 from owncloud/fix_sharing_updateBjörn Schießle2014-07-252-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | fix sharing update, add proper escaping
| * | | | | | | | | | fix sharing update, add proper escapingBjoern Schiessle2014-07-242-2/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-02 20:44:30 +0000