summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-2828-6/+226
* Merge pull request #17902 from owncloud/fix_17898Vincent Petry2015-07-271-1/+2
|\
| * get header size before we open the file to avoid locking exceptionBjoern Schiessle2015-07-271-1/+2
* | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryptionThomas Müller2015-07-275-4/+159
|\ \ | |/ |/|
| * add condition to update queryBjoern Schiessle2015-07-271-1/+1
| * Add an update script to reset the valueJoas Schilling2015-07-243-2/+98
| * Add a unit test for the disabled encryption caseJoas Schilling2015-07-231-1/+60
| * Only set is encrypted when encryption is enabledJoas Schilling2015-07-231-1/+1
* | Merge pull request #17879 from owncloud/scan-check-pathThomas Müller2015-07-272-0/+31
|\ \
| * | Add unit testsLukas Reschke2015-07-271-0/+28
| * | check if the user is trying to scan a valid pathRobin Appelman2015-07-271-0/+3
* | | Merge pull request #17894 from owncloud/since-check-for-classes-and-interfacesMorris Jobke2015-07-276-6/+28
|\ \ \ | |/ / |/| |
| * | Implement OCP Since Check for classes and interfacesMorris Jobke2015-07-271-6/+16
| * | Add PHPDoc for classes and interfacesMorris Jobke2015-07-275-0/+12
|/ /
* | Merge pull request #17878 from owncloud/fix-tipsy-fallback-titleMorris Jobke2015-07-271-3/+1
|\ \
| * | remove title option from tipsy shimHendrik Leppelsack2015-07-261-3/+1
* | | Merge pull request #17882 from owncloud/allow-classes-in-titlesMorris Jobke2015-07-272-4/+4
|\ \ \
| * | | Allow classes in <h2> tagsLukas Reschke2015-07-262-4/+4
| |/ /
* | | Merge pull request #17804 from owncloud/update-sabredav-2.1.6-masterMorris Jobke2015-07-271-0/+0
|\ \ \
| * | | Update sabre-dav to 2.1.6Joas Schilling2015-07-221-0/+0
* | | | Merge pull request #17526 from owncloud/fix-17516Morris Jobke2015-07-274-2/+96
|\ \ \ \
| * | | | LDAP: when checking group for matching filter, also take base DN into conside...Arthur Schiwon2015-07-094-2/+96
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-276-0/+42
| |_|/ / |/| | |
* | | | Merge pull request #17871 from owncloud/add-fallback-to-shimHendrik Leppelsack2015-07-261-0/+2
|\ \ \ \
| * | | | Add `fallback` to shimLukas Reschke2015-07-251-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-268-4/+16
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-256-14/+28
* | | | Merge pull request #17838 from owncloud/sharing-password-policy-masterThomas Müller2015-07-242-2/+24
|\ \ \ \
| * | | | Fix PHPDoc on setPasswordThomas Müller2015-07-232-2/+2
| * | | | Use a hook to integrate sharing password verificationThomas Müller2015-07-231-0/+22
| | |_|/ | |/| |
* | | | Merge pull request #17755 from owncloud/alias-container-aliveThomas Müller2015-07-244-51/+68
|\ \ \ \
| * | | | add registerAlias method to shorcut interface registrationBernhard Posselt2015-07-184-51/+68
* | | | | Merge pull request #17849 from owncloud/remove-commented-codeRoeland Douma2015-07-241-2/+0
|\ \ \ \ \
| * | | | | Remove commented codeMorris Jobke2015-07-241-2/+0
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2410-0/+24
|/ / / / /
* | | | | Merge pull request #17075 from owncloud/bootstrap-tooltipBernhard Posselt2015-07-2310-274/+705
|\ \ \ \ \
| * | | | | fix tipsy dependencyHendrik Leppelsack2015-07-081-2/+2
| * | | | | fix tipsy not updating on reinitializationHendrik Leppelsack2015-07-081-2/+5
| * | | | | remove debug messagesHendrik Leppelsack2015-07-061-3/+0
| * | | | | moved tooltip.js to vendor scriptsHendrik Leppelsack2015-06-227-287/+11
| * | | | | deminified tooltip.jsHendrik Leppelsack2015-06-221-1/+525
| * | | | | replaced tipsy with bootstrap tooltipHendrik Leppelsack2015-06-225-3/+186
* | | | | | Merge pull request #17827 from owncloud/dont-set-share-password-twice-master-2Thomas Müller2015-07-231-5/+12
|\ \ \ \ \ \
| * | | | | | Adding error handling in case setting the password failsThomas Müller2015-07-231-5/+12
* | | | | | | Merge pull request #17818 from owncloud/fix-password-change-error-always-show...Roeland Douma2015-07-231-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | assign error message to correct objectmichag862015-07-221-2/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-23122-270/+174
* | | | | | | Merge pull request #17815 from owncloud/update-blueimp-md5Thomas Müller2015-07-222-11/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update blueimp-md5 to 1.1.0Morris Jobke2015-07-222-11/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #17807 from owncloud/improve_apps_templateBjörn Schießle2015-07-221-4/+4
|\ \ \ \ \ \