summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+24
|
* Merge pull request #25263 from ↵Christoph Wurst2016-06-271-0/+3
|\ | | | | | | | | owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user
| * Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| | | | | | | | | | | | | | | | When decrypting all files of a single user, the admin usually does not intend encryption to be suddenly disabled for everyone. This fix reenables encryption after decrypting for a single user. Decrypting for all users will still disable encryption globally.
* | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-271-1/+1
|\ \ | | | | | | Add explicit delete permission to link shares
| * | Add explicit delete permission to link sharesVincent Petry2016-06-241-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15.
* | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-278-181/+9
|\ \ | | | | | | Remove ie8+9 support
| * | remove ie8+9 supportHendrik Leppelsack2016-06-238-181/+9
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-272-0/+14
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-262-2/+30
| |/ |/|
* | Merge pull request #25239 from owncloud/setupchecks-preventreloadVincent Petry2016-06-241-2/+4
|\ \ | |/ |/| Don't reload page in case of auth errors during setup checks
| * Don't reload page in case of auth errors during setup checksVincent Petry2016-06-231-2/+4
| | | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page.
* | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| |
* | occ web executor (#24957)VicDeo2016-06-223-0/+161
| | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-224-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-0/+36
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-176-2/+26
|
* Prevent the advanced options toggle in the setup from acting as a linkRobin Appelman2016-06-161-1/+2
|
* fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-161-13/+13
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-154-0/+56
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-134-0/+4
|
* Allow empty host when installing on oracle via CLI (#25034)Jörn Friedrich Dreyer2016-06-101-1/+6
|
* Merge pull request #25048 from owncloud/email-login-leakVincent Petry2016-06-101-2/+3
|\ | | | | Do not leak the login name
| * Do not leak the login name - fixes #25047Thomas Müller2016-06-091-2/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1018-2/+128
|/
* Fix the FIXME (#25022)Joas Schilling2016-06-091-2/+1
|
* Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-092-3/+3
|\ | | | | Use temporary htaccesstest.txt for data dir security check
| * Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-072-3/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
| |
* | Merge pull request #25027 from owncloud/fix-22746-narrowtooltipVincent Petry2016-06-081-1/+1
|\ \ | | | | | | Added width of the tooltip
| * | Added width of the tooltipSergio Bertolín2016-06-081-1/+1
| |/
* | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-085-1/+21
|\ \ | | | | | | Allow to cancel 2FA after login
| * | Allow to cancel 2FA after loginJoas Schilling2016-06-075-1/+21
| |/
* | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-082-12/+27
|\ \ | | | | | | do not generate device token if 2FA is enable for user
| * | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-072-12/+27
| |/
* | Merge pull request #24992 from owncloud/fix_decrypt_messageVincent Petry2016-06-081-1/+10
|\ \ | | | | | | Fix Decrypt message via occ
| * | Fixed reviewsSergio Bertolín2016-06-071-2/+2
| | |
| * | Comments fixeddavitol2016-06-061-3/+2
| | |
| * | Fix Decrypt message via occdavitol2016-06-061-1/+11
| | |
* | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-onlyVincent Petry2016-06-081-1/+2
|\ \ \ | | | | | | | | Allow to decrypt user '0' files only
| * | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-071-1/+2
| | |/ | |/|
* / | darker background image for better font contrastChristoph Wurst2016-06-081-0/+0
|/ /
* / Remove background from curved logo (#24980)William Bargent2016-06-061-0/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-042-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-032-150/+150
|
* Merge pull request #24947 from owncloud/2fa-remember-redirect-urlVincent Petry2016-06-024-8/+38
|\ | | | | remember redirect_url when solving the 2FA challenge
| * remember redirect_url when solving the 2FA challengeChristoph Wurst2016-06-014-8/+38
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-022-14/+40
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-012-0/+44
|
* Merge pull request #24795 from ↵Vincent Petry2016-05-312-2/+3
|\ | | | | | | | | owncloud/issue-24789-reset-password-link-new-window Allow opening the password reset link in a new window when its a URL
| * Allow opening the password reset link in a new window when its a URLJoas Schilling2016-05-242-2/+3
| |