Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into securityutils | Lukas Reschke | 2014-08-31 | 41 | -170/+385 |
|\ | |||||
| * | Merge pull request #10770 from owncloud/getUserFolder | Morris Jobke | 2014-08-31 | 1 | -1/+2 |
| |\ | |||||
| | * | update public interface for getUserFolder | Morris Jobke | 2014-08-31 | 1 | -1/+2 |
| * | | Merge pull request #10768 from owncloud/l10n-use-public | Lukas Reschke | 2014-08-31 | 19 | -41/+45 |
| |\ \ | | |/ | |/| | |||||
| | * | Also extend public server interface | Robin Appelman | 2014-08-31 | 1 | -1/+2 |
| | * | Use public api for getting l10n | Robin Appelman | 2014-08-31 | 18 | -40/+43 |
| * | | Add optional user ID parameter for getUseFolder | Morris Jobke | 2014-08-31 | 1 | -5/+9 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-31 | 2 | -28/+53 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-30 | 2 | -0/+12 |
| * | Merge pull request #10721 from owncloud/kill-rand | Robin Appelman | 2014-08-29 | 3 | -16/+11 |
| |\ | |||||
| | * | Don't register the call when rendering error pages | Robin Appelman | 2014-08-29 | 2 | -5/+8 |
| | * | Remove insecure fallback random number generation | Robin Appelman | 2014-08-29 | 1 | -11/+3 |
| * | | Merge pull request #10734 from owncloud/fix-10268 | Morris Jobke | 2014-08-29 | 2 | -4/+4 |
| |\ \ | |||||
| | * | | retrieve local users, groups and group members in a sorted way | Arthur Schiwon | 2014-08-29 | 2 | -4/+4 |
| | |/ | |||||
| * | | Merge pull request #10614 from owncloud/remove-ee-hack | Lukas Reschke | 2014-08-29 | 1 | -12/+17 |
| |\ \ | |||||
| | * | | Add isAppstoreEnabled instead of hijacking the URL | Lukas Reschke | 2014-08-26 | 1 | -6/+17 |
| | * | | Remove different URL for EE | Lukas Reschke | 2014-08-24 | 1 | -7/+1 |
| * | | | allow empty hostname and dots in service name for oracle autosetup | Jörn Friedrich Dreyer | 2014-08-29 | 1 | -0/+14 |
| | |/ | |/| | |||||
| * | | be correct in deprecation documentation | Jörn Friedrich Dreyer | 2014-08-29 | 1 | -1/+1 |
| * | | kill OC::$session | Jörn Friedrich Dreyer | 2014-08-29 | 9 | -55/+102 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-29 | 1 | -0/+3 |
| * | | Merge pull request #10670 from owncloud/encodeExceptions | Lukas Reschke | 2014-08-28 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Escape error messages | Lukas Reschke | 2014-08-27 | 1 | -4/+4 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-28 | 3 | -5/+71 |
| |/ / | |||||
| * | | Merge pull request #10653 from owncloud/x-forwarded-for | Clark Tomlinson | 2014-08-27 | 4 | -3/+31 |
| |\ \ | |||||
| | * | | Add support for getting the real client IP behind proxies | Lukas Reschke | 2014-08-27 | 4 | -3/+31 |
| * | | | Merge pull request #9915 from suraia/unsharefromself-source | Björn Schießle | 2014-08-27 | 2 | -8/+9 |
| |\ \ \ | |||||
| | * | | | 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 | 1 | -0/+1 |
| * | | | | Merge pull request #10640 from owncloud/add_moment_js | Clark Tomlinson | 2014-08-26 | 1 | -0/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | add moment.js | Georg Ehrke | 2014-08-26 | 1 | -0/+1 |
* | | | | | Use DI | Lukas Reschke | 2014-08-27 | 2 | -6/+14 |
* | | | | | Add some security utilities | Lukas Reschke | 2014-08-27 | 12 | -54/+427 |
|/ / / / | |||||
* | | | | Merge pull request #10619 from owncloud/issue/6722 | Thomas Müller | 2014-08-26 | 1 | -14/+21 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use md5() of the original name instead of uniqid() for slugifying | Joas Schilling | 2014-08-25 | 1 | -1/+12 |
| * | | | Fix code layout before fixing the function | Joas Schilling | 2014-08-25 | 1 | -13/+9 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-26 | 1 | -0/+2 |
* | | | | 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 | Joas Schilling | 2014-08-25 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | 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 | Victor Dubiniuk | 2014-07-30 | 1 | -2/+14 |
* | | | | | 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 | Robin Appelman | 2014-08-22 | 1 | -5/+4 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-25 | 1 | -0/+5 |
* | | | | | Merge pull request #10528 from owncloud/fix-htaccess-check-error | Lukas Reschke | 2014-08-24 | 1 | -184/+225 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Throw exception if file cannot be accessed via http | Clark Tomlinson | 2014-08-22 | 1 | -184/+225 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-24 | 2 | -0/+4 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-23 | 29 | -57/+5 |
|/ / / / | |||||
* | | | | Merge pull request #10584 from owncloud/simple-wizard-trusted-domains | Thomas Müller | 2014-08-22 | 3 | -10/+7 |
|\ \ \ \ | |||||
| * | | | | Expose setSystemValue | Lukas Reschke | 2014-08-22 | 2 | -6/+4 |