summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused deprecated functionRoeland Jago Douma2016-01-112-16/+0
|
* Merge pull request #21517 from owncloud/ext-oauth-fixThomas Müller2016-01-112-78/+82
|\ | | | | Fix OAuth external storage auth for step 2
| * Fix OAuth external storage auth for step 2Robin McCorkell2016-01-072-78/+82
| | | | | | | | Parameters are only available after the onCompletion promise is run
* | Merge pull request #21608 from owncloud/better-setting-templatesThomas Müller2016-01-111-23/+5
|\ \ | | | | | | improve personal page template
| * | Fix typesJoas Schilling2016-01-111-2/+2
| | |
| * | Fix table markupJoas Schilling2016-01-111-21/+3
| | |
* | | Merge pull request #21438 from owncloud/settings-anchorsThomas Müller2016-01-113-3/+3
|\ \ \ | | | | | | | | remove unneeded 'goto' prefix from settings anchors
| * | | remove unneeded 'goto' prefix from settings anchorsJan-Christoph Borchardt2016-01-043-3/+3
| | | |
* | | | Merge pull request #21589 from owncloud/mobile-webDAV-selectThomas Müller2016-01-111-2/+3
|\ \ \ \ | | | | | | | | | | webDAV select bug fixed
| * | | | webDAV select bug fixedJulian Müller2016-01-111-2/+3
| | | | |
* | | | | Merge pull request #21593 from owncloud/strict_autoloaderThomas Müller2016-01-111-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Stricter autoloader
| * | | | | Only '/tests' to be autoloaded when running unit testsRoeland Jago Douma2016-01-101-1/+3
| | | | | |
| * | | | | OC autoloader is not allowed to load 3rdpartyRoeland Jago Douma2016-01-101-1/+0
| | | | | |
* | | | | | Merge pull request #21586 from owncloud/fix-no-minimum-versionThomas Müller2016-01-111-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Assume apps from the appstore are compatible with the current version
| * | | | | | Assume apps from the appstore are compatible with the current versionLukas Reschke2016-01-101-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filtering is done server-side already so only compatible apps are delivered. Otherwise this leads to a ton of error messages as the info.xml cannot be read at that state. Fixes https://github.com/owncloud/core/issues/21556
* | | | | | Merge pull request #21573 from owncloud/fix_21535_21534Thomas Müller2016-01-112-1/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Do not increase filecount in web on file update
| * | | | | Add unit test for file updateRoeland Jago Douma2016-01-091-0/+16
| | | | | |
| * | | | | Updating a file should not update the summaryRoeland Jago Douma2016-01-091-1/+3
| | | | | |
* | | | | | Merge pull request #21594 from owncloud/cleanup_utilThomas Müller2016-01-115-20/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Remove generateRandomBytes from OC_Util
| * | | | | Remove generateRandomBytes from OC_UtilRoeland Jago Douma2016-01-105-20/+3
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1126-160/+268
| | | | |
* | | | | Merge pull request #21596 from owncloud/settings-footerMorris Jobke2016-01-112-11/+7
|\ \ \ \ \ | |/ / / / |/| | | | remove extra slogan footer from Personal and Admin pages
| * | | | remove extra slogan footer from Personal and Admin pagesJan-Christoph Borchardt2016-01-112-11/+7
|/ / / /
* | | | Merge pull request #21572 from owncloud/fix-setup-warningsThomas Müller2016-01-101-2/+2
|\ \ \ \ | | | | | | | | | | Concat also the other results
| * | | | Concat also the other resultsLukas Reschke2016-01-101-2/+2
|/ / / / | | | | | | | | | | | | Otherwise this will ignore the two last checks :speak_no_evil:
* | | | Merge pull request #21577 from ↵Morris Jobke2016-01-101-11/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/make-code-cleaner-by-removing-unrequired-security-features Remove code related to session regeneration after some time
| * | | | Remove code related to session regeneration after some timeLukas Reschke2016-01-101-11/+1
|/ / / / | | | | | | | | | | | | I do not really consider this necessary or a real security addition. Let's get rid of it thus, cleans up the code and makes the logic easier.
* | | | Merge pull request #21575 from owncloud/use-session-clearMorris Jobke2016-01-101-4/+1
|\ \ \ \ | | | | | | | | | | Use ISession::clear
| * | | | Use ISession::clearLukas Reschke2016-01-101-4/+1
|/ / / / | | | | | | | | | | | | The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1042-82/+394
| | | |
* | | | Merge pull request #21576 from owncloud/use-proper-class-nameLukas Reschke2016-01-101-1/+1
|\ \ \ \ | | | | | | | | | | Use proper class name
| * | | | Use proper class nameLukas Reschke2016-01-091-1/+1
|/ / / / | | | | | | | | | | | | This has never worked before. Introduced with https://github.com/owncloud/core/pull/18658
* | | | Merge pull request #21571 from owncloud/query_secure_randomRoeland Douma2016-01-091-1/+1
|\ \ \ \ | |/ / / |/| | | Just query the securerandom from the container
| * | | Just query the securerandom from the containerRoeland Jago Douma2016-01-091-1/+1
|/ / /
* | | Merge pull request #21562 from owncloud/properly-check-for-well-known-redirectThomas Müller2016-01-094-0/+59
|\ \ \ | | | | | | | | Add check for .well-known URL in the root of the webservers URL
| * | | Add check for .well-known URL in the root of the webservers URLMorris Jobke2016-01-084-0/+59
| | | | | | | | | | | | | | | | * fixes #20012
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0934-48/+466
|/ / /
* | | Merge pull request #19676 from owncloud/fix_15253Morris Jobke2016-01-082-46/+333
|\ \ \ | | | | | | | | Make sure that permissions stay in sync for share_type 2
| * | | Properly close db cursorsRoeland Jago Douma2016-01-082-4/+7
| | | |
| * | | Make sure to respect deleted group shares by userRoeland Jago Douma2016-01-082-1/+82
| | | |
| * | | Moved to the query builderRoeland Jago Douma2016-01-081-17/+56
| | | | | | | | | | | | | | | | Anything to keep Lukas happy
| * | | Make sure that permissions stay in sync for share_type 2Roeland Jago Douma2016-01-082-44/+208
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file/folder is shared with a group and one of the group members moves this file/folder an extra entry is created in the share table. When the permission of the group share is updated we used to only sometimes update the shares for individual users. * Added intergration tests
* | | Merge pull request #21008 from ↵Thomas Müller2016-01-081-2/+19
|\ \ \ | | | | | | | | | | | | | | | | owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers Allowing access to Swift containers shared by ACL
| * | | Allowing access to Swift containers shared by ACLTim Dettrick2016-01-081-2/+19
| | | | | | | | | | | | | | | | | | | | To avoid a confusing extra field, the bucket field is overloaded to optionally take a URL.
* | | | Merge pull request #20961 from owncloud/provis-api-group-special-charThomas Müller2016-01-082-2/+23
|\ \ \ \ | | | | | | | | | | Remove unnecessary group name validation in provisioning_api
| * | | | Update log message when error occurs during addGroupTom Needham2016-01-081-1/+1
| | | | |
| * | | | Fix provisioning API unit testRoeland Jago Douma2016-01-081-1/+1
| | | | |
| * | | | Remove unnecessary group name validationTom Needham2016-01-082-1/+22
| | | | |
* | | | | Merge pull request #21491 from owncloud/webdav_auth_no_basic_authThomas Müller2016-01-082-4/+19
|\ \ \ \ \ | | | | | | | | | | | | Also allow 'only cookie' auth to webdav
| * | | | | Allow only cookie auth to webdavRoeland Jago Douma2016-01-072-4/+19
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 14:49:25 +0000