summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into securityutilsLukas Reschke2014-08-3141-170/+385
|\
| * Merge pull request #10770 from owncloud/getUserFolderMorris Jobke2014-08-311-1/+2
| |\
| | * update public interface for getUserFolderMorris Jobke2014-08-311-1/+2
| * | Merge pull request #10768 from owncloud/l10n-use-publicLukas Reschke2014-08-3119-41/+45
| |\ \ | | |/ | |/|
| | * Also extend public server interfaceRobin Appelman2014-08-311-1/+2
| | * Use public api for getting l10nRobin Appelman2014-08-3118-40/+43
| * | Add optional user ID parameter for getUseFolderMorris Jobke2014-08-311-5/+9
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2014-08-312-28/+53
| * [tx-robot] updated from transifexJenkins for ownCloud2014-08-302-0/+12
| * Merge pull request #10721 from owncloud/kill-randRobin Appelman2014-08-293-16/+11
| |\
| | * Don't register the call when rendering error pagesRobin Appelman2014-08-292-5/+8
| | * Remove insecure fallback random number generationRobin Appelman2014-08-291-11/+3
| * | Merge pull request #10734 from owncloud/fix-10268Morris Jobke2014-08-292-4/+4
| |\ \
| | * | retrieve local users, groups and group members in a sorted wayArthur Schiwon2014-08-292-4/+4
| | |/
| * | Merge pull request #10614 from owncloud/remove-ee-hackLukas Reschke2014-08-291-12/+17
| |\ \
| | * | Add isAppstoreEnabled instead of hijacking the URLLukas Reschke2014-08-261-6/+17
| | * | Remove different URL for EELukas Reschke2014-08-241-7/+1
| * | | allow empty hostname and dots in service name for oracle autosetupJörn Friedrich Dreyer2014-08-291-0/+14
| | |/ | |/|
| * | be correct in deprecation documentationJörn Friedrich Dreyer2014-08-291-1/+1
| * | kill OC::$sessionJörn Friedrich Dreyer2014-08-299-55/+102
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-08-291-0/+3
| * | Merge pull request #10670 from owncloud/encodeExceptionsLukas Reschke2014-08-281-4/+4
| |\ \
| | * | Escape error messagesLukas Reschke2014-08-271-4/+4
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-283-5/+71
| |/ /
| * | Merge pull request #10653 from owncloud/x-forwarded-forClark Tomlinson2014-08-274-3/+31
| |\ \
| | * | Add support for getting the real client IP behind proxiesLukas Reschke2014-08-274-3/+31
| * | | Merge pull request #9915 from suraia/unsharefromself-sourceBjörn Schießle2014-08-272-8/+9
| |\ \ \
| | * | | Allow specifying the item source in unshareFromSelf().Michael Kuhn2014-07-262-8/+9
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-271-0/+1
| * | | | Merge pull request #10640 from owncloud/add_moment_jsClark Tomlinson2014-08-261-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | add moment.jsGeorg Ehrke2014-08-261-0/+1
* | | | | Use DILukas Reschke2014-08-272-6/+14
* | | | | Add some security utilitiesLukas Reschke2014-08-2712-54/+427
|/ / / /
* | | | Merge pull request #10619 from owncloud/issue/6722Thomas Müller2014-08-261-14/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Use md5() of the original name instead of uniqid() for slugifyingJoas Schilling2014-08-251-1/+12
| * | | Fix code layout before fixing the functionJoas Schilling2014-08-251-13/+9
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-261-0/+2
* | | | Merge pull request #10623 from owncloud/not-a-valid-resource-log-entriesClark Tomlinson2014-08-251-1/+6
|\ \ \ \
| * | | | Do not try to close the same resource multiple timesJoas Schilling2014-08-251-1/+6
| |/ / /
* | | | Merge pull request #10023 from owncloud/tmp-file-created-statusVincent Petry2014-08-251-2/+14
|\ \ \ \
| * | | | Log unsuccessful temp file creation and return falseVictor Dubiniuk2014-07-301-2/+14
* | | | | Merge pull request #10595 from owncloud/swift-streamJörn Friedrich Dreyer2014-08-251-5/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Stream downloads from Swift object stores without downloading it firstRobin Appelman2014-08-221-5/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-251-0/+5
* | | | | Merge pull request #10528 from owncloud/fix-htaccess-check-errorLukas Reschke2014-08-241-184/+225
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Throw exception if file cannot be accessed via httpClark Tomlinson2014-08-221-184/+225
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-242-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2329-57/+5
|/ / / /
* | | | Merge pull request #10584 from owncloud/simple-wizard-trusted-domainsThomas Müller2014-08-223-10/+7
|\ \ \ \
| * | | | Expose setSystemValueLukas Reschke2014-08-222-6/+4