Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 | Arthur Schiwon | 2015-10-30 | 2 | -0/+12 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn | Thomas Müller | 2015-11-02 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix scrollto= parameter in trashbin view | Joas Schilling | 2015-11-02 | 1 | -1/+3 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #20215 from owncloud/issue-20178-close-user-menu-on-reclick | Thomas Müller | 2015-11-02 | 3 | -4/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Close the user menu when clicking it again | Joas Schilling | 2015-11-02 | 3 | -4/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #20181 from owncloud/files-fixdownloadspinner | Thomas Müller | 2015-11-02 | 4 | -3/+101 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix file action download spinner | Vincent Petry | 2015-10-30 | 4 | -3/+101 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #20189 from owncloud/use-get-http-protocol | Thomas Müller | 2015-11-02 | 3 | -6/+6 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Use getHttpProtocol instead of $_SERVER | Lukas Reschke | 2015-10-30 | 3 | -6/+6 | |
| | |/ / | |/| | | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-02 | 14 | -10/+38 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-01 | 16 | -0/+52 | |
| |_|/ |/| | | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-31 | 18 | -4/+24 | |
* | | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip | Thomas Müller | 2015-10-31 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | add tooltip to ldap server wizard | Hendrik Leppelsack | 2015-10-29 | 1 | -0/+1 | |
* | | | | Merge pull request #20193 from owncloud/redis-password | Thomas Müller | 2015-10-30 | 2 | -0/+8 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | 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 |