| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-28 | 495 | -2230/+2370 |
| | | |||||
| * | Merge pull request #10653 from owncloud/x-forwarded-for | Clark Tomlinson | 2014-08-27 | 6 | -6/+72 |
| |\ | | | | | Add support for getting the real client IP behind proxies | ||||
| | * | Add support for getting the real client IP behind proxies | Lukas Reschke | 2014-08-27 | 6 | -6/+72 |
| | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10624 Fix copy paste fail Add unittest for comma separated headers Revert 3rdparty | ||||
| * | | Merge pull request #10666 from ogasser/appframework_db_tests | Lukas Reschke | 2014-08-27 | 2 | -7/+7 |
| |\ \ | | | | | | | Make Entity properties ```protected``` as in docs | ||||
| | * | | Make Entity properties ```protected``` as in docs | Oliver Gasser | 2014-08-27 | 2 | -7/+7 |
| |/ / | | | | | | | | | | | | | Entity properties are marked as ```protected``` to correctly reflect the documentation. See also owncloud/documentation@644f2eedac8e912c3019366b29ecdfbd9a15c5d9 | ||||
| * | | Merge pull request #9915 from suraia/unsharefromself-source | Björn Schießle | 2014-08-27 | 3 | -8/+33 |
| |\ \ | | | | | | | Allow specifying the item source in unshareFromSelf(). | ||||
| | * | | Add unit tests for new unshareFromSelf() functionality. | Michael Kuhn | 2014-08-23 | 1 | -0/+24 |
| | | | | |||||
| | * | | Allow specifying the item source in unshareFromSelf(). | Michael Kuhn | 2014-07-26 | 2 | -8/+9 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-27 | 30 | -115/+155 |
| | | | | |||||
| * | | | Merge pull request #10641 from callahad/email-input-type | Lukas Reschke | 2014-08-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Set email input field to type=email for better UX | ||||
| | * | | | Set email input field to type=email for better UX | Dan Callahan | 2014-08-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #10640 from owncloud/add_moment_js | Clark Tomlinson | 2014-08-26 | 2 | -0/+9084 |
| |\ \ \ \ | |_|_|/ |/| | | | add moment.js | ||||
| | * | | | add moment.js | Georg Ehrke | 2014-08-26 | 2 | -0/+9084 |
| | | | | | |||||
| * | | | | Merge pull request #10604 from owncloud/fixing-favicon | Thomas Müller | 2014-08-26 | 3 | -3/+3 |
| |\ \ \ \ | |_|/ / |/| | | | Adding type to favicon | ||||
| | * | | | Adding type to favicon | Clark Tomlinson | 2014-08-22 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #9844 from OliverKohlDSc/patch-1 | Thomas Müller | 2014-08-26 | 1 | -2/+4 |
| |\ \ \ \ | | | | | | | | | | | CRON call ends in null exception | ||||
| | * | | | | Update cron.php | Oliver Kohl D.Sc. | 2014-07-24 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | CRON call ends in null exception | Oliver Kohl D.Sc. | 2014-07-24 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [error] 4461#0: *186285 FastCGI sent in stderr: "PHP message : PHP Fatal error: Call to a member function execute() on null in /var/www/ownc loud/cron.php on line 125" while reading response header from upstream, client: 217.13.183.252, server: cloud.mycloud.com, request: "GET /cron.php HTTP/1.1", upstre am: "fastcgi://unix:/var/run/php5-fpm.sock:", host: "cloud.mycloud.com", referrer: " https://cloud.mycloud.com/" | ||||
| * | | | | | Merge pull request #10619 from owncloud/issue/6722 | Thomas Müller | 2014-08-26 | 2 | -37/+59 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Add a test to break the slugifyPath() with folder and file afterwards | ||||
| | * | | | | Use md5() of the original name instead of uniqid() for slugifying | Joas Schilling | 2014-08-25 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used uniqid() here. However this means that the behaviour is not reproducable, so when uploading files into a "empty" folder, the folders name is different. If there would be a md5() hash collition, the deduplicate check will spot this and append an index later, so this should not be a problem. Fix #6722 | ||||
| | * | | | | Fix code layout before fixing the function | Joas Schilling | 2014-08-25 | 1 | -13/+9 |
| | | | | | | |||||
| | * | | | | Use a data provider instead of calling the function manually everytime | Joas Schilling | 2014-08-25 | 1 | -33/+35 |
| | | | | | | |||||
| | * | | | | Add a test to break the slugifyPath() with folder and file afterwards | Joas Schilling | 2014-08-25 | 1 | -1/+14 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-26 | 500 | -1577/+1694 |
| | | | | | | |||||
| * | | | | | Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries | Clark Tomlinson | 2014-08-25 | 1 | -1/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | Do not try to close the same resource multiple times | ||||
| | * | | | | | Do not try to close the same resource multiple times | Joas Schilling | 2014-08-25 | 1 | -1/+6 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #10421 from owncloud/share-external-delete | Clark Tomlinson | 2014-08-25 | 1 | -1/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove no longer existing files from the cache when scanning external storage | ||||
| | * | | | | | Remove no longer existing files from the cache when scanning external storage | Robin Appelman | 2014-08-14 | 1 | -1/+11 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10023 from owncloud/tmp-file-created-status | Vincent Petry | 2014-08-25 | 1 | -2/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Log unsuccessful temp file creation and return false | ||||
| | * | | | | | | Log unsuccessful temp file creation and return false | Victor Dubiniuk | 2014-07-30 | 1 | -2/+14 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #10108 from owncloud/files_external-allowed-backend | Vincent Petry | 2014-08-25 | 1 | -6/+10 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Only load personal external storages for allowed backends | ||||
| | * | | | | | | | Only load personal external storages for allowed backends | Robin Appelman | 2014-08-01 | 1 | -6/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset | Lukas Reschke | 2014-08-25 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Warn user on resetting passwords via occ when encryption is enabled | ||||
| | * | | | | | | | | Warn user on resetting passwords via occ when encryption is enabled | kondou | 2014-08-22 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #10591 from owncloud/routes_for_files_external | Vincent Petry | 2014-08-25 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | explicit routes for files_external | ||||
| | * | | | | | | | | | explicit routes for files_external | Jörn Friedrich Dreyer | 2014-08-22 | 1 | -0/+17 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #10595 from owncloud/swift-stream | Jörn Friedrich Dreyer | 2014-08-25 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | Stream downloads from Swift object stores without downloading it first | ||||
| | * | | | | | | | | | Stream downloads from Swift object stores without downloading it first | Robin Appelman | 2014-08-22 | 1 | -5/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-25 | 477 | -3418/+3447 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #10528 from owncloud/fix-htaccess-check-error | Lukas Reschke | 2014-08-24 | 1 | -184/+225 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix htaccess check error | ||||
| | * | | | | | | | | | | Throw exception if file cannot be accessed via http | Clark Tomlinson | 2014-08-22 | 1 | -184/+225 |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format file Removing calls to deprecated classes and using internal method to get via http Missed a character Fix inverted logic | ||||
| * | | | | | | | | | | Merge pull request #9818 from owncloud/fix-mount-file-config | Robin McCorkell | 2014-08-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Comment out mount_file config option | ||||
| | * | | | | | | | | | | Comment out mount_file config option | Robin McCorkell | 2014-08-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents sample config issues with external storages. Fixes #9734 | ||||
| * | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-24 | 525 | -1121/+1258 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-23 | 617 | -3328/+5497 |
| | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #10584 from owncloud/simple-wizard-trusted-domains | Thomas Müller | 2014-08-22 | 7 | -12/+58 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add a trusted domain wizard | ||||
| | * | | | | | | | | | | Redirect user after clicking on link | Lukas Reschke | 2014-08-22 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use DI | ||||
| | * | | | | | | | | | | Expose setSystemValue | Lukas Reschke | 2014-08-22 | 2 | -6/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add a trusted domain wizard | Lukas Reschke | 2014-08-21 | 5 | -6/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain. By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement. | ||||
| * | | | | | | | | | | | Merge pull request #10590 from owncloud/fix-10585 | Clark Tomlinson | 2014-08-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add require_once to update.php due to routing | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |