Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12759 from owncloud/core-reduce-js-and-css | Jörn Friedrich Dreyer | 2014-12-18 | 9 | -46/+47 |
|\ | | | | | make sure styles and scripts are only loaded once | ||||
| * | load showpassord.js conditionally in the template only if needed | Thomas Müller | 2014-12-16 | 6 | -31/+13 |
| | | |||||
| * | use script instead of \OCP\Util methods | Thomas Müller | 2014-12-16 | 1 | -5/+8 |
| | | |||||
| * | make sure styles and scripts are only loaded once | Thomas Müller | 2014-12-16 | 2 | -10/+26 |
| | | |||||
* | | Merge pull request #12896 from owncloud/drop-deprecated | Jörn Friedrich Dreyer | 2014-12-18 | 13 | -44/+44 |
|\ \ | | | | | | | first step to drop \OCP\Config:: in favour of IConfig | ||||
| * | | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 13 | -44/+44 |
| |/ | |||||
* | | Merge pull request #12870 from owncloud/send-mail-new-user | Thomas Müller | 2014-12-18 | 8 | -10/+239 |
|\ \ | | | | | | | Send mail for new users | ||||
| * | | add unit tests for new user create mail | Morris Jobke | 2014-12-16 | 2 | -2/+78 |
| | | | |||||
| * | | Send mail for new users | Morris Jobke | 2014-12-16 | 7 | -10/+163 |
| |/ | | | | | | | | | | | * supply mail address * send mail with username and URL to that mail address * option to temporary enable this feature | ||||
* | | Merge pull request #12947 from owncloud/fix-spinner-file-upload-ie89 | Jan-Christoph Borchardt | 2014-12-18 | 1 | -0/+15 |
|\ \ | | | | | | | show spinner on file upload in IE8, 9 | ||||
| * | | show spinner on file upload in IE8, 9 | Morris Jobke | 2014-12-18 | 1 | -0/+15 |
| | | | |||||
* | | | Merge pull request #12945 from owncloud/hhvm-image | Morris Jobke | 2014-12-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | HHVM: Do not call filesize(null), this function expects a string. | ||||
| * | | | Do not call filesize(null), this function expects a string. | Andreas Fischer | 2014-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called. | ||||
* | | | | Merge pull request #12940 from drarko/master | Morris Jobke | 2014-12-18 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix extra quotes in custom tags in header | ||||
| * | | | Fix extra quotes in custom tags in header | drarko | 2014-12-18 | 1 | -1/+1 |
| |/ / | | | | | | | Fix #12939 | ||||
* | | | Merge pull request #12907 from owncloud/delete-invalid-external-share | Robin Appelman | 2014-12-18 | 2 | -0/+13 |
|\ \ \ | |/ / |/| | | Fix deleting invalid s2s shares | ||||
| * | | Root always exists | Robin Appelman | 2014-12-17 | 1 | -0/+8 |
| | | | |||||
| * | | Movable mountpoints are always deletable | Robin Appelman | 2014-12-17 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #12925 from owncloud/fix-js-unit-tests | Vincent Petry | 2014-12-18 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | be more explicit in JS unit tests - caused by accessibility issues | ||||
| * | | | be more explicit in JS unit tests - caused by accessibility issues | Morris Jobke | 2014-12-18 | 2 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-18 | 400 | -550/+92 |
| | | | | |||||
* | | | | Merge pull request #12820 from owncloud/user-management-on-large-screens | Robin McCorkell | 2014-12-18 | 1 | -4/+16 |
|\ \ \ \ | | | | | | | | | | | fix initial loading limit of user management on large screens | ||||
| * | | | | fix initial loading limit of user management on large screens | Morris Jobke | 2014-12-12 | 1 | -4/+16 |
| | | | | | |||||
* | | | | | Merge pull request #12901 from owncloud/move-ldap-check-to-manager | Robin McCorkell | 2014-12-18 | 2 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Move the Null-Byte LDAP check to the user manager | ||||
| * | | | | | Move the Null-Byte LDAP check to the user manager | Lukas Reschke | 2014-12-17 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here. Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020 | ||||
* | | | | | | Merge pull request #12913 from owncloud/hhvm-memcached-clear | Robin McCorkell | 2014-12-18 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | HHVM: Add workaround for missing Memcached::deleteMulti() | ||||
| * | | | | | HHVM: Add workaround for missing Memcached::deleteMulti() | Andreas Fischer | 2014-12-17 | 1 | -1/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #12900 from owncloud/more-accessibility | Thomas Müller | 2014-12-18 | 7 | -6/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | More accessibility fixes for Files | ||||
| * | | | | | add label for search field for screen readers | Jan-Christoph Borchardt | 2014-12-17 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | use method to only visually hide elements, show only for screen reader | Jan-Christoph Borchardt | 2014-12-17 | 5 | -5/+16 |
| | | | | | | |||||
| * | | | | | add text to Settings button | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | add alt text to 'Cancel upload' button | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | fix Delete action text being translatable | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | add empty alt text for user image | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | add text to Delete action | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | properly name form labels for the file selection | Jan-Christoph Borchardt | 2014-12-17 | 2 | -1/+4 |
| | | | | | | |||||
| * | | | | | fix alt text for breadcrumbs home icon | Jan-Christoph Borchardt | 2014-12-17 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #12924 from owncloud/improve-emptystates | Thomas Müller | 2014-12-18 | 10 | -13/+48 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve empty states | ||||
| * | | | | | | add empty state for external storages | Jan-Christoph Borchardt | 2014-12-17 | 4 | -1/+13 |
| | | | | | | | |||||
| * | | | | | | wording fix for Files app empty state | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | apply empty state for 'Deleted files' | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | improve empty state of 'All files' | Jan-Christoph Borchardt | 2014-12-17 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | improve empty states for sharing and shared links as well | Jan-Christoph Borchardt | 2014-12-17 | 1 | -3/+7 |
| | | | | | | | |||||
| * | | | | | | use empty state for 'Shared with you' as well | Jan-Christoph Borchardt | 2014-12-17 | 2 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | even better empty state for Favorites, and general Empty State style | Jan-Christoph Borchardt | 2014-12-17 | 3 | -7/+13 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #12917 from owncloud/fix-ocs-12915-api | Morris Jobke | 2014-12-18 | 3 | -6/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move basic auth login out of `isLoggedIn` | ||||
| * | | | | | | Check basic auth header only for not-logged-in users | Lukas Reschke | 2014-12-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Store result of authentication | Lukas Reschke | 2014-12-17 | 1 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | Move basic auth login out of `isLoggedIn` | Lukas Reschke | 2014-12-17 | 2 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs... Please test very carefully, this includes: - Testing from OCS via cURL (as in #12915) - Testing from OCS via browser (Open the "Von Dir geteilt" shares overview) - WebDAV - CalDAV - CardDAV | ||||
* | | | | | | | Merge pull request #12168 from owncloud/docker-webdav | Thomas Müller | 2014-12-17 | 14 | -6/+474 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Setup a docker container that holds a webdav instance to test files_exte... |