summaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
5.x-1.xStripping CVS keywordsThe Great Git Migration3 years
5.x-2.xStripping CVS keywordsThe Great Git Migration3 years
6.x-2.xStripping CVS keywordsThe Great Git Migration3 years
7.x-2.xStripping CVS keywordsThe Great Git Migration3 years
7.x-3.xIssue #2207259 by bherring - Support conflict buffer to extend the conflict d...Brian Osborne4 months
 
TagDownloadAuthorAge
7.x-3.2commit afaf9ee6a5...Brian Osborne5 months
7.x-3.1commit eaf839caf8...Brian Osborne5 months
7.x-3.0commit c40c6e466c...Campbell Vertesi15 months
6.x-2.0commit 34744c067e...Andrew Berry5 years
6.x-2.0-rc1commit 34744c067e...Andrew Berry5 years
5.x-2.1commit 81f8010fda...Andrew Berry5 years
5.x-2.1-rc1commit 81f8010fda...Andrew Berry5 years
5.x-2.0commit c9cd8c49f5...Andrew Berry6 years
5.x-1.1commit ca3557376b...Andrew Berry6 years
5.x-1.0commit d056a4bf0c...Andrew Berry7 years
 
AgeCommit messageAuthorFilesLines
2014-03-17Issue #2207259 by bherring - Support conflict buffer to extend the conflict d...HEAD7.x-3.xBrian Osborne2-0/+49
2014-03-11Never tested with revisioning enabled. I was comparing NID to revision ID. Ne...7.x-3.2Brian Osborne1-1/+1
2014-03-11Improve wording to be more clear7.x-3.1Brian Osborne1-3/+4
2014-03-08Issue #1875042 by MagicMcj: Use tagged dynamic query to let other modules alt...Brian Osborne1-1/+3
2014-03-08add link to documentationBrian Osborne1-0/+3
2014-03-08Makes more sense to return an empty array when no conflicts were loaded; Some...Brian Osborne1-2/+5
2014-03-08don't theme the errors as an item list, because if there are multiple form er...Brian Osborne1-2/+3
2014-03-08refactoring and reorganizing some code; fixed the potential double execution ...Brian Osborne1-59/+80
2014-03-08Issue #2213443 by bkosborne: remove the rules_forms dependency, which wasn't ...Brian Osborne3-7/+13
2014-03-03cleanup and refactoring. removed the requirement for the date field to be req...Brian Osborne1-32/+38
[...]
 
Clone
git://git.drupal.org/project/resource_conflict.git