Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-12 | 26 | -14/+164 |
* | Merge pull request #21622 from owncloud/revert-21479-fix-broken-state-in-htac... | Thomas Müller | 2016-01-11 | 1 | -0/+4 |
|\ | |||||
| * | Revert "Remove unneeded check if htaccess test file already exists" | Lukas Reschke | 2016-01-11 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #21613 from owncloud/dav-fix-constructor | Thomas Müller | 2016-01-11 | 1 | -2/+1 |
|\ | |||||
| * | fix principal constructor for dav | Robin Appelman | 2016-01-11 | 1 | -2/+1 |
* | | Merge pull request #21517 from owncloud/ext-oauth-fix | Thomas Müller | 2016-01-11 | 2 | -78/+82 |
|\ \ | |||||
| * | | Fix OAuth external storage auth for step 2 | Robin McCorkell | 2016-01-07 | 2 | -78/+82 |
* | | | Merge pull request #21608 from owncloud/better-setting-templates | Thomas Müller | 2016-01-11 | 1 | -23/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix types | Joas Schilling | 2016-01-11 | 1 | -2/+2 |
| * | | Fix table markup | Joas Schilling | 2016-01-11 | 1 | -21/+3 |
* | | | Merge pull request #21438 from owncloud/settings-anchors | Thomas Müller | 2016-01-11 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | remove unneeded 'goto' prefix from settings anchors | Jan-Christoph Borchardt | 2016-01-04 | 3 | -3/+3 |
* | | | | Merge pull request #21589 from owncloud/mobile-webDAV-select | Thomas Müller | 2016-01-11 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | webDAV select bug fixed | Julian Müller | 2016-01-11 | 1 | -2/+3 |
* | | | | | Merge pull request #21593 from owncloud/strict_autoloader | Thomas Müller | 2016-01-11 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Only '/tests' to be autoloaded when running unit tests | Roeland Jago Douma | 2016-01-10 | 1 | -1/+3 |
| * | | | | | OC autoloader is not allowed to load 3rdparty | Roeland Jago Douma | 2016-01-10 | 1 | -1/+0 |
* | | | | | | Merge pull request #21586 from owncloud/fix-no-minimum-version | Thomas Müller | 2016-01-11 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Assume apps from the appstore are compatible with the current version | Lukas Reschke | 2016-01-10 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21573 from owncloud/fix_21535_21534 | Thomas Müller | 2016-01-11 | 2 | -1/+19 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Add unit test for file update | Roeland Jago Douma | 2016-01-09 | 1 | -0/+16 |
| * | | | | | Updating a file should not update the summary | Roeland Jago Douma | 2016-01-09 | 1 | -1/+3 |
* | | | | | | Merge pull request #21594 from owncloud/cleanup_util | Thomas Müller | 2016-01-11 | 5 | -20/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Remove generateRandomBytes from OC_Util | Roeland Jago Douma | 2016-01-10 | 5 | -20/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-11 | 26 | -160/+268 |
* | | | | | Merge pull request #21596 from owncloud/settings-footer | Morris Jobke | 2016-01-11 | 2 | -11/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | remove extra slogan footer from Personal and Admin pages | Jan-Christoph Borchardt | 2016-01-11 | 2 | -11/+7 |
|/ / / / | |||||
* | | | | Merge pull request #21572 from owncloud/fix-setup-warnings | Thomas Müller | 2016-01-10 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Concat also the other results | Lukas Reschke | 2016-01-10 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #21577 from owncloud/make-code-cleaner-by-removing-unrequi... | Morris Jobke | 2016-01-10 | 1 | -11/+1 |
|\ \ \ \ | |||||
| * | | | | Remove code related to session regeneration after some time | Lukas Reschke | 2016-01-10 | 1 | -11/+1 |
|/ / / / | |||||
* | | | | Merge pull request #21575 from owncloud/use-session-clear | Morris Jobke | 2016-01-10 | 1 | -4/+1 |
|\ \ \ \ | |||||
| * | | | | Use ISession::clear | Lukas Reschke | 2016-01-10 | 1 | -4/+1 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-10 | 42 | -82/+394 |
* | | | | Merge pull request #21576 from owncloud/use-proper-class-name | Lukas Reschke | 2016-01-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use proper class name | Lukas Reschke | 2016-01-09 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #21571 from owncloud/query_secure_random | Roeland Douma | 2016-01-09 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Just query the securerandom from the container | Roeland Jago Douma | 2016-01-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #21562 from owncloud/properly-check-for-well-known-redirect | Thomas Müller | 2016-01-09 | 4 | -0/+59 |
|\ \ \ | |||||
| * | | | Add check for .well-known URL in the root of the webservers URL | Morris Jobke | 2016-01-08 | 4 | -0/+59 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-09 | 34 | -48/+466 |
|/ / / | |||||
* | | | Merge pull request #19676 from owncloud/fix_15253 | Morris Jobke | 2016-01-08 | 2 | -46/+333 |
|\ \ \ | |||||
| * | | | Properly close db cursors | Roeland Jago Douma | 2016-01-08 | 2 | -4/+7 |
| * | | | Make sure to respect deleted group shares by user | Roeland Jago Douma | 2016-01-08 | 2 | -1/+82 |
| * | | | Moved to the query builder | Roeland Jago Douma | 2016-01-08 | 1 | -17/+56 |
| * | | | Make sure that permissions stay in sync for share_type 2 | Roeland Jago Douma | 2016-01-08 | 2 | -44/+208 |
|/ / / | |||||
* | | | Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-c... | Thomas Müller | 2016-01-08 | 1 | -2/+19 |
|\ \ \ | |||||
| * | | | Allowing access to Swift containers shared by ACL | Tim Dettrick | 2016-01-08 | 1 | -2/+19 |
* | | | | Merge pull request #20961 from owncloud/provis-api-group-special-char | Thomas Müller | 2016-01-08 | 2 | -2/+23 |
|\ \ \ \ | |||||
| * | | | | Update log message when error occurs during addGroup | Tom Needham | 2016-01-08 | 1 | -1/+1 |