Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| * | | Fix provisioning API unit test | Roeland Jago Douma | 2016-01-08 | 1 | -1/+1 |
| * | | Remove unnecessary group name validation | Tom Needham | 2016-01-08 | 2 | -1/+22 |
* | | | Merge pull request #21491 from owncloud/webdav_auth_no_basic_auth | Thomas Müller | 2016-01-08 | 2 | -4/+19 |
|\ \ \ | |||||
| * | | | Allow only cookie auth to webdav | Roeland Jago Douma | 2016-01-07 | 2 | -4/+19 |
* | | | | Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspec | Thomas Müller | 2016-01-08 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Fix public page URL JS test | Vincent Petry | 2016-01-08 | 1 | -1/+3 |
* | | | | | Merge pull request #21553 from owncloud/gwdg-master | Thomas Müller | 2016-01-08 | 1 | -2/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Respect user enumeration | Ralph Krimmel | 2016-01-08 | 1 | -2/+19 |
* | | | | | | Merge pull request #21458 from owncloud/login-gradient | Thomas Müller | 2016-01-08 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add back gradient for log in page in Firefox, fix accidental removal | Jan-Christoph Borchardt | 2016-01-05 | 1 | -0/+1 |
* | | | | | | | Merge pull request #21467 from owncloud/external-status-check-userglobal | Thomas Müller | 2016-01-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix checking external storage status as non admin user | Robin Appelman | 2016-01-08 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #21468 from owncloud/getmount-id-filter | Thomas Müller | 2016-01-08 | 7 | -4/+102 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Filter getStorage to make sure the user has access to it | Robin Appelman | 2016-01-08 | 7 | -4/+102 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21548 from owncloud/issue-21511-correctly-display-notify-... | Thomas Müller | 2016-01-08 | 3 | -3/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check the correct config for displaying the "notify by email" option | Joas Schilling | 2016-01-08 | 3 | -3/+10 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21540 from owncloud/group-principals | Thomas Müller | 2016-01-08 | 8 | -33/+459 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Adding unit tests for SystemPrincipalBackend | Thomas Müller | 2016-01-08 | 3 | -6/+133 |
| * | | | | | | | | Adding group principals to new dav endpoint | Thomas Müller | 2016-01-08 | 5 | -27/+326 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21447 from owncloud/leave-disabled-apps-off | Thomas Müller | 2016-01-08 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Only enable apps that are not intentionally disabled | Joas Schilling | 2016-01-04 | 1 | -2/+3 |
* | | | | | | | | | Merge pull request #21494 from owncloud/underscores-in-class-names | Thomas Müller | 2016-01-08 | 4 | -38/+41 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | OC_TemplateLayout -> OC\TemplateLayout | Morris Jobke | 2016-01-07 | 2 | -32/+27 |
| * | | | | | | | | | OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManager | Morris Jobke | 2016-01-07 | 2 | -6/+14 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #21286 from owncloud/use-owncloud-mail-when-sending-caldav... | Thomas Müller | 2016-01-08 | 4 | -3/+214 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Adding IMip scheduling which uses ownClouds mail delivery | Thomas Müller | 2016-01-08 | 4 | -3/+214 |
* | | | | | | | | | | Merge pull request #21538 from owncloud/remove-csp-stuff | Thomas Müller | 2016-01-08 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove CSP stuff from .htaccess | Lukas Reschke | 2016-01-08 | 1 | -7/+0 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #21479 from owncloud/fix-broken-state-in-htaccess-test | Thomas Müller | 2016-01-08 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove unneeded check if htaccess test file already exists | Morris Jobke | 2016-01-06 | 1 | -4/+0 |
* | | | | | | | | | | Merge pull request #21215 from owncloud/files_external-db-set-mountpoint | Thomas Müller | 2016-01-08 | 7 | -2/+112 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | correctly set applicables when updating user storage | Robin Appelman | 2016-01-08 | 1 | -0/+13 |
| * | | | | | | | | | | update tests | Robin Appelman | 2016-01-08 | 2 | -1/+5 |
| * | | | | | | | | | | improve setting applicable for personal mounts | Robin Appelman | 2016-01-08 | 1 | -1/+1 |
| * | | | | | | | | | | fix setting mountpoint and auth backend of external storages | Robin Appelman | 2016-01-08 | 4 | -0/+93 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore | Thomas Müller | 2016-01-08 | 2 | -15/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | core will handle invalid URLs and redirects properly | Morris Jobke | 2015-12-18 | 2 | -15/+1 |
* | | | | | | | | | | | Merge pull request #21536 from owncloud/avatar_verify_posted_path | Thomas Müller | 2016-01-08 | 3 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | fix warning box size for avatar change | Morris Jobke | 2016-01-08 | 1 | -1/+1 |
| * | | | | | | | | | | Verify the path is a file on avatar update | Roeland Jago Douma | 2016-01-08 | 2 | -0/+20 |