summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
|\ | | | | Use a hook to integrate sharing password verification
| * 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 shortcut interface registration #17714
| * | add registerAlias method to shorcut interface registrationBernhard Posselt2015-07-184-51/+68
| | | | | | | | | | | | | | | | | | | | | | | | remove unused import add since tag fix typo
* | | Merge pull request #17849 from owncloud/remove-commented-codeRoeland Douma2015-07-241-2/+0
|\ \ \ | | | | | | | | Remove commented code
| * | | 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
|\ \ \ | | | | | | | | Replace jQuery tipsy with bootstrap tooltip
| * | | 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 fails
| * | | | Adding error handling in case setting the password failsThomas Müller2015-07-231-5/+12
| | | | |
* | | | | Merge pull request #17818 from ↵Roeland Douma2015-07-231-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | owncloud/fix-password-change-error-always-shows-default-error assign password change error message to correct object
| * | | | assign error message to correct objectmichag862015-07-221-2/+2
| | | | | | | | | | | | | | | fix for #17817
* | | | | [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.0
| * | | | Update blueimp-md5 to 1.1.0Morris Jobke2015-07-222-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yes this is pretty empty, but it's the truth: https://github.com/blueimp/JavaScript-MD5/compare/1.0.3...1.1.0
* | | | | Merge pull request #17807 from owncloud/improve_apps_templateBjörn Schießle2015-07-221-4/+4
|\ \ \ \ \ | | | | | | | | | | | | make sure that there is a space between user- and admin-documentation
| * | | | | use arrow to indicate external link, use correct quotes and capitalizationJan-Christoph Borchardt2015-07-221-2/+2
| | | | | |
| * | | | | make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-221-4/+4
| | | | | |
* | | | | | Merge pull request #17413 from owncloud/public-api-querybuilderMorris Jobke2015-07-2230-175/+4488
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add public api for Doctrine QueryBuilder and ExpressionBuilder
| * | | | | | Add a log message when the Doctrine Query Builder is retrievedJoas Schilling2015-07-214-24/+39
| | | | | | |
| * | | | | | Comment out LIMIT 0 case because of the mixed resultsJoas Schilling2015-07-212-1/+6
| | | | | | |
| * | | | | | Fix tests for setFirstResult and setMaxResults on oracleJoas Schilling2015-07-213-44/+66
| | | | | | |
| * | | | | | Set a limit until doctrine released a version that fixes SqliteJoas Schilling2015-07-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/doctrine/dbal/pull/782 for more info
| * | | | | | Correctly count the number of items (rowCount is Update/Insert/Delete only)Joas Schilling2015-07-211-13/+22
| | | | | | |
| * | | | | | Can not test the string, thanks oracle....Joas Schilling2015-07-211-10/+32
| | | | | | |
| * | | | | | Fix existing usages by removing the quotesJoas Schilling2015-07-219-103/+109
| | | | | | |
| * | | | | | Add unit tests and automatic quotingJoas Schilling2015-07-2120-157/+2039
| | | | | | |
| * | | | | | Use the public interface and our method instead of the doctrine thingJoas Schilling2015-07-2111-72/+71
| | | | | | |
| * | | | | | Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappersJoas Schilling2015-07-219-0/+2349
| | | | | | |
* | | | | | | Merge pull request #17806 from owncloud/enc_improved_app_descriptionRobin McCorkell2015-07-221-13/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | improved app description for the default encryption module
| * | | | | | improved app description and adjust it to the way the new encryption module ↵Bjoern Schiessle2015-07-221-13/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | works
* | | | | | Merge pull request #17792 from szepeviktor/masterRobin McCorkell2015-07-222-24/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixing line comments and indentation, closes #17781
| * | | | | | Fixing line comments and indentationViktor Szépe2015-07-212-24/+25
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17342 from rullzer/test_preview_conditionsRoeland Douma2015-07-222-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Only run some preview unit tets if imagemagick is available
| * | | | | Only run some preview unit tets if imagemagick is availableRoeland Jago Douma2015-07-022-0/+5
| | | | | |
* | | | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_groupMorris Jobke2015-07-214-32/+206
|\ \ \ \ \ \ | | | | | | | | | | | | | | [sharing] fix addToGroup hook
| * | | | | | intproduce pre_addToGroup hook. we need to calculate the possible uniqueBjoern Schiessle2015-07-063-28/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targets before the user was added to the group otherwise we will always detect a name collision
| * | | | | | use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10
| | | | | | |
* | | | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detectionJoas Schilling2015-07-212-4/+81
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix system wide mount point detection on migration
| * | | | | | | fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #17766 from owncloud/escape-ampersandRoeland Douma2015-07-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Escape ampersand in logout URL
| * | | | | | | Escape ampersand in logout URLMorris Jobke2015-07-211-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * fixes #17757
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 14:43:09 +0000