summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Fixed wrong brackets in apps settingsDer-Jan2014-07-301-1/+1
* | | | | | | Merge pull request #10024 from owncloud/preview-restrict-heightMorris Jobke2014-07-303-10/+8
|\ \ \ \ \ \ \
| * | | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-303-10/+8
| |/ / / / / /
* | | | | | | Merge pull request #9897 from owncloud/support_webdav_copyBjörn Schießle2014-07-307-42/+272
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | add unit test for rename and copy operationBjoern Schiessle2014-07-304-7/+171
| * | | | | | make sure that we always find all versionsBjoern Schiessle2014-07-301-22/+37
| * | | | | | make the versions and encryption app aware of the copy operationBjoern Schiessle2014-07-305-14/+65
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoloadJörn Friedrich Dreyer2014-07-302-11/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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-302-1/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add unit testBjoern Schiessle2014-07-281-0/+26
| * | | | | make sure that we set the expire date if a date is adefault date is setBjoern Schiessle2014-07-281-1/+2
* | | | | | Merge pull request #10032 from owncloud/kill-swift-testsMorris Jobke2014-07-301-0/+3
|\ \ \ \ \ \
| * | | | | | only if the environment variable RUN_OBJECTSTORE_TESTS is set the object stor...Thomas Müller2014-07-291-0/+3
* | | | | | | Merge pull request #10041 from owncloud/design-link-folder-iconMorris Jobke2014-07-302-19/+22
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | also use link icon for the folders ..Jan-Christoph Borchardt2014-07-302-19/+22
* | | | | | | Merge pull request #9888 from owncloud/mysql-tinyint-masterThomas Müller2014-07-303-1/+53
|\ \ \ \ \ \ \
| * | | | | | | migration test for sqlite - adding type mapping for 'tinyint unsigned'Thomas Müller2014-07-293-1/+53
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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-30157-3181/+3904
| |_|/ / / |/| | | |
* | | | | 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
|\ \ \ \ \ \ \