summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10022 from owncloud/fix-exec-admin-masterThomas Müller2014-07-291-3/+5
|\
| * only call exec() if allowed toThomas Müller2014-07-291-3/+5
* | Merge pull request #10020 from owncloud/design-link-iconJan-Christoph Borchardt2014-07-292-2/+5
|\ \ | |/ |/|
| * use more understandable 'link' icon for public links (instead of hard to reco...Jan-Christoph Borchardt2014-07-292-2/+5
* | Merge pull request #9721 from owncloud/enc_define_type_in_pre_hookBjörn Schießle2014-07-291-4/+7
|\ \
| * | define type in pre hookBjoern Schiessle2014-07-181-4/+7
* | | Merge pull request #9951 from owncloud/enc_inproved_error_messagesBjörn Schießle2014-07-293-3/+13
|\ \ \
| * | | show a warning in the personal settings and admin settins if the encyption ke...Bjoern Schiessle2014-07-283-3/+13
* | | | Merge pull request #9988 from owncloud/sharing_remove_share_permissionBjörn Schießle2014-07-292-1/+34
|\ \ \ \
| * | | | remove share permission if user is excluded from sharingBjoern Schiessle2014-07-292-1/+34
* | | | | Merge pull request #9983 from owncloud/sharing_add_unshare_to_overviewBjörn Schießle2014-07-291-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | update attributes for share with user list, file should always have delete pe...Bjoern Schiessle2014-07-281-0/+3
| |/ / /
* | | | [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 matchThomas Müller2014-07-291-5/+5
| |/ / /
* | | | Merge pull request #9945 from owncloud/remove-mssql-bundle-masterThomas Müller2014-07-281-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | 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 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
|\ \ \ \
| * | | | 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 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 #9853 from owncloud/design-mobile-searchMorris Jobke2014-07-284-5/+19
|\ \ \ \ \ \
| * | | | | | 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 Previewjosh4trunks2014-07-221-3/+2
* | | | | | | | 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...Jan-Christoph Borchardt2014-07-072-16/+22
* | | | | | | | | Merge pull request #9847 from owncloud/design-input-groupingJan-Christoph Borchardt2014-07-281-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 bookThomas Müller2014-07-243-0/+208
* | | | | | | | | | | Merge pull request #9631 from owncloud/update-getid3Thomas Müller2014-07-282-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 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
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |