Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Fixed wrong brackets in apps settings | Der-Jan | 2014-07-30 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #10024 from owncloud/preview-restrict-height | Morris Jobke | 2014-07-30 | 3 | -10/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratio | Robin Appelman | 2014-07-30 | 3 | -10/+8 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #9897 from owncloud/support_webdav_copy | Björn Schießle | 2014-07-30 | 7 | -42/+272 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | add unit test for rename and copy operation | Bjoern Schiessle | 2014-07-30 | 4 | -7/+171 | |
| * | | | | | | make sure that we always find all versions | Bjoern Schiessle | 2014-07-30 | 1 | -22/+37 | |
| * | | | | | | make the versions and encryption app aware of the copy operation | Bjoern Schiessle | 2014-07-30 | 5 | -14/+65 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload | Jörn Friedrich Dreyer | 2014-07-30 | 2 | -11/+22 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add registerAutoloaderCache(). | Andreas Fischer | 2014-07-29 | 1 | -15/+18 | |
| * | | | | | Memcache\Factory: Remove static, use globalPrefix. | Andreas Fischer | 2014-07-29 | 2 | -4/+14 | |
| * | | | | | InstanceId is properly injected into factory. Remove comment. | Andreas Fischer | 2014-07-29 | 1 | -2/+0 | |
* | | | | | | Merge pull request #9970 from owncloud/sharing_set_expire_date | Morris Jobke | 2014-07-30 | 2 | -1/+28 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | add unit test | Bjoern Schiessle | 2014-07-28 | 1 | -0/+26 | |
| * | | | | | make sure that we set the expire date if a date is adefault date is set | Bjoern Schiessle | 2014-07-28 | 1 | -1/+2 | |
* | | | | | | Merge pull request #10032 from owncloud/kill-swift-tests | Morris Jobke | 2014-07-30 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | only if the environment variable RUN_OBJECTSTORE_TESTS is set the object stor... | Thomas Müller | 2014-07-29 | 1 | -0/+3 | |
* | | | | | | | Merge pull request #10041 from owncloud/design-link-folder-icon | Morris Jobke | 2014-07-30 | 2 | -19/+22 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | also use link icon for the folders .. | Jan-Christoph Borchardt | 2014-07-30 | 2 | -19/+22 | |
* | | | | | | | Merge pull request #9888 from owncloud/mysql-tinyint-master | Thomas Müller | 2014-07-30 | 3 | -1/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | migration test for sqlite - adding type mapping for 'tinyint unsigned' | Thomas Müller | 2014-07-29 | 3 | -1/+53 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9914 from owncloud/fix-appframework-blank-template | Thomas Müller | 2014-07-30 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix template rendering for 'blank' templates | Morris Jobke | 2014-07-29 | 1 | -1/+3 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-30 | 157 | -3181/+3904 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #10022 from owncloud/fix-exec-admin-master | Thomas Müller | 2014-07-29 | 1 | -3/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | only call exec() if allowed to | Thomas Müller | 2014-07-29 | 1 | -3/+5 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #10020 from owncloud/design-link-icon | Jan-Christoph Borchardt | 2014-07-29 | 2 | -2/+5 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | use more understandable 'link' icon for public links (instead of hard to reco... | Jan-Christoph Borchardt | 2014-07-29 | 2 | -2/+5 | |
| |/ / / | ||||||
* | | | | Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook | Björn Schießle | 2014-07-29 | 1 | -4/+7 | |
|\ \ \ \ | ||||||
| * | | | | define type in pre hook | Bjoern Schiessle | 2014-07-18 | 1 | -4/+7 | |
* | | | | | Merge pull request #9951 from owncloud/enc_inproved_error_messages | Björn Schießle | 2014-07-29 | 3 | -3/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | show a warning in the personal settings and admin settins if the encyption ke... | Bjoern Schiessle | 2014-07-28 | 3 | -3/+13 | |
* | | | | | | Merge pull request #9988 from owncloud/sharing_remove_share_permission | Björn Schießle | 2014-07-29 | 2 | -1/+34 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove share permission if user is excluded from sharing | Bjoern Schiessle | 2014-07-29 | 2 | -1/+34 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview | Björn Schießle | 2014-07-29 | 1 | -0/+3 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | update attributes for share with user list, file should always have delete pe... | Bjoern Schiessle | 2014-07-28 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-29 | 296 | -9598/+14775 | |
* | | | | | Merge pull request #9989 from owncloud/fix-failing-unit-test-master | Thomas Müller | 2014-07-29 | 1 | -5/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | function declaration did not match | Thomas Müller | 2014-07-29 | 1 | -5/+5 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #9945 from owncloud/remove-mssql-bundle-master | Thomas Müller | 2014-07-28 | 1 | -0/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | remove MssqlBundle | Thomas Müller | 2014-07-28 | 1 | -0/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #9758 from owncloud/share-expdatefix | Björn Schießle | 2014-07-28 | 4 | -15/+170 | |
|\ \ \ \ | ||||||
| * | | | | Fix enforced share expiration date to be based on share time | Vincent Petry | 2014-07-21 | 4 | -15/+170 | |
* | | | | | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date | Björn Schießle | 2014-07-28 | 8 | -34/+225 | |
|\ \ \ \ \ | ||||||
| * | | | | | adjust error code | Bjoern Schiessle | 2014-07-28 | 1 | -2/+2 | |
| * | | | | | add OCS api call to set expire date for link shares | Bjoern Schiessle | 2014-07-25 | 8 | -33/+224 | |
* | | | | | | Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster | Morris Jobke | 2014-07-28 | 2 | -2/+27 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | generate copy of sqlite database file in data directory | Thomas Müller | 2014-07-28 | 2 | -2/+27 | |
* | | | | | | | Merge pull request #9924 from owncloud/eventsource-nginx-buffering | Robin Appelman | 2014-07-28 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Prevent nginx from buffering event source events | Robin Appelman | 2014-07-26 | 1 | -0/+2 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9853 from owncloud/design-mobile-search | Morris Jobke | 2014-07-28 | 4 | -5/+19 | |
|\ \ \ \ \ \ \ |