Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add support for Redis password auth | Lukas Reschke | 2015-10-30 | 2 | -0/+8 | |
|/ / / | ||||||
* | | | Merge pull request #20175 from owncloud/login-arrow | Thomas Müller | 2015-10-30 | 7 | -39/+0 | |
|\ \ \ | ||||||
| * | | | remove unneeded icons from input fields to not distract from submit button, f... | Jan-Christoph Borchardt | 2015-10-30 | 7 | -39/+0 | |
* | | | | Merge pull request #20169 from RealRancor/fix_contributing_links | Thomas Müller | 2015-10-30 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Fix repo links in CONTRIBUTING.md | RealRancor | 2015-10-30 | 1 | -2/+2 | |
* | | | | | Merge pull request #20171 from owncloud/tags.js-remove-unneeded-vars | Thomas Müller | 2015-10-30 | 1 | -9/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | [tags] remove unneeded variables | Morris Jobke | 2015-10-30 | 1 | -9/+0 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview | Thomas Müller | 2015-10-30 | 2 | -27/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Bring back delete permission in share overview | Vincent Petry | 2015-10-29 | 2 | -27/+11 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #20167 from owncloud/fix-docker-ip-retrieval | Thomas Müller | 2015-10-30 | 6 | -8/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use proper statement to retrieve the IP of an docker instance | Morris Jobke | 2015-10-30 | 6 | -8/+8 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #20170 from owncloud/remove-some-oc_config-calls | Thomas Müller | 2015-10-30 | 3 | -6/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replace some OC_Config calls with ILogger methods | Morris Jobke | 2015-10-30 | 3 | -6/+7 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #20156 from owncloud/files-filter-triger-once | Robin Appelman | 2015-10-30 | 1 | -2/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | dont trigger the scroll event of every single item we filter in the file list | Robin Appelman | 2015-10-29 | 1 | -2/+3 | |
* | | | | | | Merge pull request #20149 from owncloud/revert-19797-specify-php-5-4 | Thomas Müller | 2015-10-30 | 1 | -10/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Specify PHP 5.4 as version for scrutinizer" | Lukas Reschke | 2015-10-29 | 1 | -10/+0 | |
* | | | | | | | Merge pull request #20166 from owncloud/error-message-l10n-failure | Thomas Müller | 2015-10-30 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Add warning for broken l10n json files | Morris Jobke | 2015-10-30 | 1 | -0/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #19680 from owncloud/ocs_sharing_api_integration_testing | Thomas Müller | 2015-10-30 | 5 | -58/+312 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Upgrade behat to 3.0.x and use @BeforeScenario and @AfterScenario to clean up... | Thomas Müller | 2015-10-29 | 5 | -39/+43 | |
| * | | | | | | added sharing feature file | Sergio Bertolin | 2015-10-29 | 2 | -28/+278 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-30 | 42 | -28/+274 | |
* | | | | | | Merge pull request #20051 from otetard/feature/newfilemenu_extend | Thomas Müller | 2015-10-29 | 1 | -31/+46 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Allow apps to add new items in the “New” filemenu. | Olivier Tétard | 2015-10-26 | 1 | -31/+46 | |
* | | | | | | Merge pull request #20135 from owncloud/check-if-null-subadmin | Thomas Müller | 2015-10-29 | 25 | -1793/+2538 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Drop OC_SubAdmin and replace usages | Lukas Reschke | 2015-10-29 | 25 | -1793/+2538 | |
* | | | | | | | Merge pull request #20060 from owncloud/cache-move-final-update-transaction | Robin Appelman | 2015-10-29 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | include the final update in the transaction when moving a folder in the cache | Robin Appelman | 2015-10-29 | 1 | -2/+6 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #20152 from owncloud/LukasReschke-patch-1 | Thomas Müller | 2015-10-29 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove invalid type-cast | Lukas Reschke | 2015-10-29 | 1 | -4/+4 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #20122 from owncloud/files-consolidateiconupdate | Thomas Müller | 2015-10-29 | 8 | -11/+109 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix icon update to be more consistent | Vincent Petry | 2015-10-29 | 8 | -11/+109 | |
* | | | | | | | Merge pull request #19592 from owncloud/availability-root-always-exists | Thomas Müller | 2015-10-29 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | The root of a storage always exists | Robin Appelman | 2015-10-29 | 1 | -0/+3 | |
* | | | | | | | | Merge pull request #20134 from owncloud/pass-with-skipping | Thomas Müller | 2015-10-29 | 3 | -24/+27 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make Travis CI pass when DAV was not touched | Joas Schilling | 2015-10-29 | 3 | -24/+27 | |
* | | | | | | | | | Merge pull request #20141 from owncloud/checkboxes-settings-users | Thomas Müller | 2015-10-29 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | apply new checkbox style in users settings | Hendrik Leppelsack | 2015-10-29 | 1 | -5/+5 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #20144 from owncloud/gitignore-clover.xml | Thomas Müller | 2015-10-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | ignore any clover.xml - which is generated by some phpunit calls | Thomas Müller | 2015-10-29 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename | Thomas Müller | 2015-10-29 | 4 | -3/+74 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix locking unit tests due to filemtime addition | Vincent Petry | 2015-10-26 | 1 | -2/+10 | |
| * | | | | | | | | Also adjust storage_mtime of target after rename | Vincent Petry | 2015-10-26 | 3 | -1/+64 | |
* | | | | | | | | | Merge pull request #11509 from owncloud/internal_email_template | Thomas Müller | 2015-10-29 | 3 | -5/+57 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Allow separate templates for internal and external share notifications | Stephen Colebrook | 2015-10-29 | 3 | -5/+57 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-... | Thomas Müller | 2015-10-29 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't log expected Swift 404 responses | Tim Dettrick | 2015-09-14 | 1 | -1/+4 | |
* | | | | | | | | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailable | Thomas Müller | 2015-10-29 | 4 | -14/+67 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Display storage status as tooltip | Robin McCorkell | 2015-10-23 | 4 | -7/+47 |