Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11229 from kofemann/for-upstream | Lukas Reschke | 2014-09-24 | 1 | -9/+8 |
|\ | |||||
| * | user/backed: use pow of two for backed action constants | Tigran Mkrtchyan | 2014-09-23 | 1 | -9/+8 |
* | | Merge pull request #11275 from owncloud/drop-if-e | Morris Jobke | 2014-09-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | Drop only if exists | Lukas Reschke | 2014-09-24 | 1 | -1/+1 |
|/ / | |||||
* | | autotest.sh shall not terminate if mysql db could not be dropped | Thomas Müller | 2014-09-24 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-24 | 128 | -601/+388 |
* | | Merge pull request #11265 from owncloud/fix-11264 | Morris Jobke | 2014-09-24 | 1 | -0/+6 |
|\ \ | |||||
| * | | Check for blacklisted characters | Lukas Reschke | 2014-09-23 | 1 | -0/+6 |
* | | | Merge pull request #11254 from owncloud/fix-filepicker-home-icon | Volkan Gezer | 2014-09-23 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix filepicker home icon being partly hidden, fix #10169 | Jan-Christoph Borchardt | 2014-09-23 | 1 | -0/+2 |
* | | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser | Lukas Reschke | 2014-09-23 | 8 | -63/+75 |
|\ \ \ | |||||
| * | | | fix error message template | Morris Jobke | 2014-09-17 | 1 | -0/+1 |
| * | | | replace horizontal rules with whitespace | Jan-Christoph Borchardt | 2014-09-17 | 1 | -3/+4 |
| * | | | Do not show exception to the end-user | Lukas Reschke | 2014-09-17 | 8 | -63/+74 |
* | | | | Merge pull request #7051 from owncloud/postsetupajaxcheck | Vincent Petry | 2014-09-23 | 9 | -83/+146 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Moved WebDAV and internet checks to client side JS | Vincent Petry | 2014-09-23 | 9 | -83/+146 |
* | | | | Merge pull request #11109 from owncloud/nstamm-patch-1 | Jan-Christoph Borchardt | 2014-09-23 | 1 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | adjust text size and opacity of drag'n'drop upload text style | Jan-Christoph Borchardt | 2014-09-23 | 1 | -0/+4 |
| * | | | | DragnDrop Upload text style | Nicolas Stamm | 2014-09-16 | 1 | -1/+4 |
* | | | | | Merge pull request #11222 from owncloud/store-users-timezone-master | Thomas Müller | 2014-09-23 | 8 | -20/+417 |
|\ \ \ \ \ | |||||
| * | | | | | enhance formatDate function to accept an optional argument containing the tim... | Thomas Müller | 2014-09-22 | 3 | -9/+45 |
| * | | | | | date printed in the admin section regarding last execution time is already di... | Thomas Müller | 2014-09-22 | 1 | -1/+1 |
| * | | | | | send browsers timezone back tp the server on login | Thomas Müller | 2014-09-22 | 4 | -10/+371 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #11234 from owncloud/fix-icon-classes | Jan-Christoph Borchardt | 2014-09-23 | 8 | -14/+23 |
|\ \ \ \ \ | |||||
| * | | | | | force show the loading icon in list for deletion, not only on hover | Jan-Christoph Borchardt | 2014-09-22 | 1 | -0/+9 |
| * | | | | | correct progress-icon to icon-loading-small | Jan-Christoph Borchardt | 2014-09-22 | 4 | -10/+10 |
| * | | | | | correct delete-icon to icon-delete, fix #11128 | Jan-Christoph Borchardt | 2014-09-22 | 7 | -14/+14 |
* | | | | | | Merge pull request #11137 from owncloud/enc-pregfix | Vincent Petry | 2014-09-23 | 10 | -113/+384 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix share key finding algorithm in various cases | Vincent Petry | 2014-09-23 | 10 | -113/+384 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #11241 from owncloud/use-lower-case | Thomas Müller | 2014-09-23 | 2 | -2/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use only lower-case letters | Lukas Reschke | 2014-09-22 | 2 | -2/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #11032 from owncloud/harden-redirect | Lukas Reschke | 2014-09-23 | 8 | -96/+302 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Do only follow HTTP and HTTPS redirects | Lukas Reschke | 2014-09-22 | 8 | -96/+302 |
* | | | | | | Merge pull request #11226 from owncloud/kill-postsetupcheck-master | Vincent Petry | 2014-09-23 | 3 | -30/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove post setup check | Thomas Müller | 2014-09-22 | 3 | -30/+4 |
* | | | | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_user | Lukas Reschke | 2014-09-23 | 1 | -5/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | first check if a private key exists, if not it is always a recovery szenario | Bjoern Schiessle | 2014-09-22 | 1 | -5/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #11242 from owncloud/fix-10284 | Lukas Reschke | 2014-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use non-empty defaults | Victor Dubiniuk | 2014-09-22 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-23 | 21 | -17/+45 |
* | | | | | | | Merge pull request #11227 from owncloud/fix-windows-path | Thomas Müller | 2014-09-23 | 5 | -9/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ignoring writedata test in windows. | Clark Tomlinson | 2014-09-22 | 1 | -0/+3 |
| * | | | | | | | fixing cache routes | Clark Tomlinson | 2014-09-22 | 3 | -7/+7 |
| * | | | | | | | fixing directory seperators | Clark Tomlinson | 2014-09-22 | 1 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #11221 from owncloud/fix-autotest | Thomas Müller | 2014-09-23 | 1 | -14/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix autotest.sh for whitespace in paths | Robin McCorkell | 2014-09-22 | 1 | -14/+14 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #11215 from owncloud/dav-throwwhendeletefailed | Morris Jobke | 2014-09-23 | 4 | -7/+131 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | WebDAV now throws 403 when deletion did not work | Vincent Petry | 2014-09-22 | 4 | -7/+131 |
* | | | | | | | | Merge pull request #11211 from owncloud/previewProviderSwitch | Morris Jobke | 2014-09-23 | 7 | -84/+63 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Remove unneeded unit tests | Lukas Reschke | 2014-09-22 | 3 | -23/+0 |