summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12759 from owncloud/core-reduce-js-and-cssJörn Friedrich Dreyer2014-12-189-46/+47
|\ | | | | make sure styles and scripts are only loaded once
| * load showpassord.js conditionally in the template only if neededThomas Müller2014-12-166-31/+13
| |
| * use script instead of \OCP\Util methodsThomas Müller2014-12-161-5/+8
| |
| * make sure styles and scripts are only loaded onceThomas Müller2014-12-162-10/+26
| |
* | Merge pull request #12896 from owncloud/drop-deprecatedJörn Friedrich Dreyer2014-12-1813-44/+44
|\ \ | | | | | | first step to drop \OCP\Config:: in favour of IConfig
| * | first step to drop \OCP\Config:: in favour of IConfigMorris Jobke2014-12-1713-44/+44
| |/
* | Merge pull request #12870 from owncloud/send-mail-new-userThomas Müller2014-12-188-10/+239
|\ \ | | | | | | Send mail for new users
| * | add unit tests for new user create mailMorris Jobke2014-12-162-2/+78
| | |
| * | Send mail for new usersMorris Jobke2014-12-167-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-ie89Jan-Christoph Borchardt2014-12-181-0/+15
|\ \ | | | | | | show spinner on file upload in IE8, 9
| * | show spinner on file upload in IE8, 9Morris Jobke2014-12-181-0/+15
| | |
* | | Merge pull request #12945 from owncloud/hhvm-imageMorris Jobke2014-12-181-1/+1
|\ \ \ | | | | | | | | HHVM: Do not call filesize(null), this function expects a string.
| * | | Do not call filesize(null), this function expects a string.Andreas Fischer2014-12-181-1/+1
| | | | | | | | | | | | | | | | filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
* | | | Merge pull request #12940 from drarko/masterMorris Jobke2014-12-181-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix extra quotes in custom tags in header
| * | | Fix extra quotes in custom tags in headerdrarko2014-12-181-1/+1
| |/ / | | | | | | Fix #12939
* | | Merge pull request #12907 from owncloud/delete-invalid-external-shareRobin Appelman2014-12-182-0/+13
|\ \ \ | |/ / |/| | Fix deleting invalid s2s shares
| * | Root always existsRobin Appelman2014-12-171-0/+8
| | |
| * | Movable mountpoints are always deletableRobin Appelman2014-12-171-0/+5
| | |
* | | Merge pull request #12925 from owncloud/fix-js-unit-testsVincent Petry2014-12-182-2/+2
|\ \ \ | | | | | | | | be more explicit in JS unit tests - caused by accessibility issues
| * | | be more explicit in JS unit tests - caused by accessibility issuesMorris Jobke2014-12-182-2/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-18400-550/+92
| | | |
* | | | Merge pull request #12820 from owncloud/user-management-on-large-screensRobin McCorkell2014-12-181-4/+16
|\ \ \ \ | | | | | | | | | | fix initial loading limit of user management on large screens
| * | | | fix initial loading limit of user management on large screensMorris Jobke2014-12-121-4/+16
| | | | |
* | | | | Merge pull request #12901 from owncloud/move-ldap-check-to-managerRobin McCorkell2014-12-182-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Move the Null-Byte LDAP check to the user manager
| * | | | | Move the Null-Byte LDAP check to the user managerLukas Reschke2014-12-172-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-clearRobin McCorkell2014-12-181-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | HHVM: Add workaround for missing Memcached::deleteMulti()
| * | | | | HHVM: Add workaround for missing Memcached::deleteMulti()Andreas Fischer2014-12-171-1/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #12900 from owncloud/more-accessibilityThomas Müller2014-12-187-6/+31
|\ \ \ \ \ | | | | | | | | | | | | More accessibility fixes for Files
| * | | | | add label for search field for screen readersJan-Christoph Borchardt2014-12-171-0/+3
| | | | | |
| * | | | | use method to only visually hide elements, show only for screen readerJan-Christoph Borchardt2014-12-175-5/+16
| | | | | |
| * | | | | add text to Settings buttonJan-Christoph Borchardt2014-12-171-1/+3
| | | | | |
| * | | | | add alt text to 'Cancel upload' buttonJan-Christoph Borchardt2014-12-171-1/+2
| | | | | |
| * | | | | fix Delete action text being translatableJan-Christoph Borchardt2014-12-171-1/+2
| | | | | |
| * | | | | add empty alt text for user imageJan-Christoph Borchardt2014-12-171-1/+2
| | | | | |
| * | | | | add text to Delete actionJan-Christoph Borchardt2014-12-171-1/+2
| | | | | |
| * | | | | properly name form labels for the file selectionJan-Christoph Borchardt2014-12-172-1/+4
| | | | | |
| * | | | | fix alt text for breadcrumbs home iconJan-Christoph Borchardt2014-12-171-0/+2
| | | | | |
* | | | | | Merge pull request #12924 from owncloud/improve-emptystatesThomas Müller2014-12-1810-13/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve empty states
| * | | | | | add empty state for external storagesJan-Christoph Borchardt2014-12-174-1/+13
| | | | | | |
| * | | | | | wording fix for Files app empty stateJan-Christoph Borchardt2014-12-171-1/+1
| | | | | | |
| * | | | | | apply empty state for 'Deleted files'Jan-Christoph Borchardt2014-12-171-1/+5
| | | | | | |
| * | | | | | improve empty state of 'All files'Jan-Christoph Borchardt2014-12-171-1/+5
| | | | | | |
| * | | | | | improve empty states for sharing and shared links as wellJan-Christoph Borchardt2014-12-171-3/+7
| | | | | | |
| * | | | | | use empty state for 'Shared with you' as wellJan-Christoph Borchardt2014-12-172-1/+6
| | | | | | |
| * | | | | | even better empty state for Favorites, and general Empty State styleJan-Christoph Borchardt2014-12-173-7/+13
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12917 from owncloud/fix-ocs-12915-apiMorris Jobke2014-12-183-6/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move basic auth login out of `isLoggedIn`
| * | | | | | Check basic auth header only for not-logged-in usersLukas Reschke2014-12-171-1/+1
| | | | | | |
| * | | | | | Store result of authenticationLukas Reschke2014-12-171-1/+7
| | | | | | |
| * | | | | | Move basic auth login out of `isLoggedIn`Lukas Reschke2014-12-172-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-webdavThomas Müller2014-12-1714-6/+474
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Setup a docker container that holds a webdav instance to test files_exte...