Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add possible use of docker instance for MariaDB | Roeland Jago Douma | 2015-07-29 | 1 | -11/+44 |
* | Merge pull request #17878 from owncloud/fix-tipsy-fallback-title | Morris Jobke | 2015-07-27 | 1 | -3/+1 |
|\ | |||||
| * | remove title option from tipsy shim | Hendrik Leppelsack | 2015-07-26 | 1 | -3/+1 |
* | | Merge pull request #17882 from owncloud/allow-classes-in-titles | Morris Jobke | 2015-07-27 | 2 | -4/+4 |
|\ \ | |||||
| * | | Allow classes in <h2> tags | Lukas Reschke | 2015-07-26 | 2 | -4/+4 |
| |/ | |||||
* | | Merge pull request #17804 from owncloud/update-sabredav-2.1.6-master | Morris Jobke | 2015-07-27 | 1 | -0/+0 |
|\ \ | |||||
| * | | Update sabre-dav to 2.1.6 | Joas Schilling | 2015-07-22 | 1 | -0/+0 |
* | | | Merge pull request #17526 from owncloud/fix-17516 | Morris Jobke | 2015-07-27 | 4 | -2/+96 |
|\ \ \ | |||||
| * | | | LDAP: when checking group for matching filter, also take base DN into conside... | Arthur Schiwon | 2015-07-09 | 4 | -2/+96 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-27 | 6 | -0/+42 |
| |_|/ |/| | | |||||
* | | | Merge pull request #17871 from owncloud/add-fallback-to-shim | Hendrik Leppelsack | 2015-07-26 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Add `fallback` to shim | Lukas Reschke | 2015-07-25 | 1 | -0/+2 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-26 | 8 | -4/+16 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-25 | 6 | -14/+28 |
* | | | Merge pull request #17838 from owncloud/sharing-password-policy-master | Thomas Müller | 2015-07-24 | 2 | -2/+24 |
|\ \ \ | |||||
| * | | | Fix PHPDoc on setPassword | Thomas Müller | 2015-07-23 | 2 | -2/+2 |
| * | | | Use a hook to integrate sharing password verification | Thomas Müller | 2015-07-23 | 1 | -0/+22 |
* | | | | Merge pull request #17755 from owncloud/alias-container-alive | Thomas Müller | 2015-07-24 | 4 | -51/+68 |
|\ \ \ \ | |||||
| * | | | | add registerAlias method to shorcut interface registration | Bernhard Posselt | 2015-07-18 | 4 | -51/+68 |
* | | | | | Merge pull request #17849 from owncloud/remove-commented-code | Roeland Douma | 2015-07-24 | 1 | -2/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove commented code | Morris Jobke | 2015-07-24 | 1 | -2/+0 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-24 | 10 | -0/+24 |
|/ / / / / | |||||
* | | | | | Merge pull request #17075 from owncloud/bootstrap-tooltip | Bernhard Posselt | 2015-07-23 | 10 | -274/+705 |
|\ \ \ \ \ | |||||
| * | | | | | fix tipsy dependency | Hendrik Leppelsack | 2015-07-08 | 1 | -2/+2 |
| * | | | | | fix tipsy not updating on reinitialization | Hendrik Leppelsack | 2015-07-08 | 1 | -2/+5 |
| * | | | | | remove debug messages | Hendrik Leppelsack | 2015-07-06 | 1 | -3/+0 |
| * | | | | | moved tooltip.js to vendor scripts | Hendrik Leppelsack | 2015-06-22 | 7 | -287/+11 |
| * | | | | | deminified tooltip.js | Hendrik Leppelsack | 2015-06-22 | 1 | -1/+525 |
| * | | | | | replaced tipsy with bootstrap tooltip | Hendrik Leppelsack | 2015-06-22 | 5 | -3/+186 |
* | | | | | | Merge pull request #17827 from owncloud/dont-set-share-password-twice-master-2 | Thomas Müller | 2015-07-23 | 1 | -5/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adding error handling in case setting the password fails | Thomas Müller | 2015-07-23 | 1 | -5/+12 |
* | | | | | | | Merge pull request #17818 from owncloud/fix-password-change-error-always-show... | Roeland Douma | 2015-07-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | assign error message to correct object | michag86 | 2015-07-22 | 1 | -2/+2 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-23 | 122 | -270/+174 |
* | | | | | | | Merge pull request #17815 from owncloud/update-blueimp-md5 | Thomas Müller | 2015-07-22 | 2 | -11/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Update blueimp-md5 to 1.1.0 | Morris Jobke | 2015-07-22 | 2 | -11/+12 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #17807 from owncloud/improve_apps_template | Björn Schießle | 2015-07-22 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use arrow to indicate external link, use correct quotes and capitalization | Jan-Christoph Borchardt | 2015-07-22 | 1 | -2/+2 |
| * | | | | | | make sure that there is a space between user- and admin-documentation | Bjoern Schiessle | 2015-07-22 | 1 | -4/+4 |
* | | | | | | | Merge pull request #17413 from owncloud/public-api-querybuilder | Morris Jobke | 2015-07-22 | 30 | -175/+4488 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add a log message when the Doctrine Query Builder is retrieved | Joas Schilling | 2015-07-21 | 4 | -24/+39 |
| * | | | | | | | Comment out LIMIT 0 case because of the mixed results | Joas Schilling | 2015-07-21 | 2 | -1/+6 |
| * | | | | | | | Fix tests for setFirstResult and setMaxResults on oracle | Joas Schilling | 2015-07-21 | 3 | -44/+66 |
| * | | | | | | | Set a limit until doctrine released a version that fixes Sqlite | Joas Schilling | 2015-07-21 | 1 | -0/+4 |
| * | | | | | | | Correctly count the number of items (rowCount is Update/Insert/Delete only) | Joas Schilling | 2015-07-21 | 1 | -13/+22 |
| * | | | | | | | Can not test the string, thanks oracle.... | Joas Schilling | 2015-07-21 | 1 | -10/+32 |
| * | | | | | | | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 9 | -103/+109 |
| * | | | | | | | Add unit tests and automatic quoting | Joas Schilling | 2015-07-21 | 20 | -157/+2039 |
| * | | | | | | | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 11 | -72/+71 |
| * | | | | | | | Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers | Joas Schilling | 2015-07-21 | 9 | -0/+2349 |