projects
/
civicrm-core.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 4.5 into 4.6
2015-03-20
Tim Otten
CRM-16132 - Fix warning, "mysqli_error() expects parameter...
commit
|
commitdiff
|
tree
2015-03-20
Tim Otten
CRM-16080 - CRM.strings - Preserve variable placeholders
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
crmUiHelp - Render title once (rather than watching)
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
crmMailing,crmMailingAB - Rename scope.help() to scope...
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
crmUiHelp - Syntax cleanup
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
crmUiHelp - Remove unnecessary code
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
CRM-15706 - Use scope.help() instead of scope.crmUiHelpFile
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
crmUiField - Remove double-$parent
commit
|
commitdiff
|
tree
2015-03-19
Tim Otten
CRM-15706 - Loosen coupling between crmUiHelp and crmUiField...
commit
|
commitdiff
|
tree
2015-03-17
Tim Otten
Merge pull request #5411 from totten/4.6-unused-test
commit
|
commitdiff
|
tree
2015-03-17
Tim Otten
CRM-16120 - crmUiDebug - Only display debug fields...
commit
|
commitdiff
|
tree
2015-03-16
Tim Otten
Remove unused, boilerplate test file
commit
|
commitdiff
|
tree
2015-03-07
Tim Otten
CRM-16063 - MailingComponent.create API - Fix management...
commit
|
commitdiff
|
tree
2015-03-07
Tim Otten
CRM-16063 - MailingComponent.create API - is_active...
commit
|
commitdiff
|
tree
2015-03-07
Tim Otten
Merge pull request #5327 from colemanw/totten-master...
commit
|
commitdiff
|
tree
2015-03-07
Tim Otten
Merge pull request #5329 from totten/master-bower-fch
commit
|
commitdiff
|
tree
2015-03-07
Tim Otten
Merge branch 'atif-shaikh-CRM-15979'
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge branch 'master' into atif-shaikh-CRM-15979
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge pull request #5316 from GinkgoFJG/CRM-15965-4.6
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge pull request #5324 from totten/4.5-mailingcomp...
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
setup.sh - bower - Only use "-f" if bower.json has...
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge pull request #5319 from totten/master-setup-nodejs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
CRM-16063 - Mailing Component - Reset is_default when...
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
CRM-16063 - Mailing Component - Fix saving of booleans
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
CRM-16063 - CiviMail - Get full list of active mailin...
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge pull request #5318 from totten/4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '7aa3a631943cb' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '9974506a13375' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit 'e2d85c92c3232' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '013198e90942d' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '227e59a6a8437' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit 'd8f34a6e5245e' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '8939b4b21c001' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '1ebbf8bfc16f4' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '1ad799fac8340' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit 'c940014dce8bd' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '762fe6d92bc' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit '9942d1dc86' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-06
Tim Otten
Merge commit 'b02664034bd2' into 4.5-missing-prs
commit
|
commitdiff
|
tree
2015-03-04
Tim Otten
setup.sh, npm test - Fix for debian.org's build of...
commit
|
commitdiff
|
tree
2015-03-04
Tim Otten
Merge pull request #5302 from totten/master-karma-phantom
commit
|
commitdiff
|
tree
2015-03-04
Tim Otten
CRM-16046 - Move karma.conf.js to default location
commit
|
commitdiff
|
tree
2015-03-04
Tim Otten
CRM-16046 - karma - Use PhantomJS by default
commit
|
commitdiff
|
tree
2015-03-04
Tim Otten
CRM-15854 - MailingAB API - Restrict to 'access CiviMail'
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
Merge pull request #5300 from totten/4.5-setupsh-hostport
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
setup.conf.txt - Add DBHOST and DBPORT
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
CRM-15854 - crmMailing, crmMailingAB - Respect 'delete...
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
CRM-15854 - CiviMail workflow, new UI - Consistent...
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
CRM-15854 - CiviMail workflow, old UI - Consistent...
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
crmMailing/review.html - Show preview for text (if...
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
CRM-15854 - Fix previews for user without 'create mailings'
commit
|
commitdiff
|
tree
2015-03-03
Tim Otten
Merge pull request #5290 from totten/4.5-watchdog
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM-15854 - Fix crash on review form
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM-15854 - CRM_Core_IDS - Allow AJAX calls with HTML...
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM-15854 - crmMailing - Adapt layout (w/conditionals...
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM-15854 - crmMailing - Fix initialization of scope...
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
crmMetadata - Provide both options and optionsMap
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
crmUiWizard - Fix error when first wizard step is conditional
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM-15854 - CRM_Mailing_Info - Export workflow details...
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM-15929 - Drupal watchdog
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
Merge pull request #5281 from totten/4.5-email-test
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
CRM_Mailing_Form_Test - Email formatting
commit
|
commitdiff
|
tree
2015-03-02
Tim Otten
Merge pull request #5157 from GinkgoFJG/CRM-15965
commit
|
commitdiff
|
tree
2015-02-26
Tim Otten
Merge pull request #5260 from totten/4.5-test-tz2
commit
|
commitdiff
|
tree
2015-02-26
Tim Otten
CRM-14423 - CiviUnitTestCase - UnitTest UF should set...
commit
|
commitdiff
|
tree
2015-02-26
Tim Otten
Merge pull request #5256 from totten/master-composer...
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
Merge branch 'mlutfy-CRM-13584'
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
install/index.php - Fix warning
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
Merge branch 'CRM-13584' of https://github.com/mlutfy...
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
composer.lock - Re-add to git
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
CRM-15943 - Move replyTo option from $config to a setting.
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
CRM-16005 - Check for dompdf using more file patterns
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
CRM-16005 - Use and configure the dompdf provided by...
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
Merge remote-tracking branch 'origin/4.5' into 4.5...
commit
|
commitdiff
|
tree
2015-02-25
Tim Otten
Merge pull request #5243 from totten/4.5-dompdf
commit
|
commitdiff
|
tree
2015-02-24
Tim Otten
CRM-16005 - Use and configure the dompdf provided by...
commit
|
commitdiff
|
tree
2015-02-24
Tim Otten
CRM_Mailing_Info - Remove dead code
commit
|
commitdiff
|
tree
2015-02-24
Tim Otten
CRM-15578 - Filter message templates on is_active=>1
commit
|
commitdiff
|
tree
2015-02-24
Tim Otten
CRM-15995 - When viewing details from AB test report...
commit
|
commitdiff
|
tree
2015-02-24
Tim Otten
ngSanitize - Remove unused module
commit
|
commitdiff
|
tree
2015-02-24
Tim Otten
Merge pull request #5220 from totten/master-recip-grptype
commit
|
commitdiff
|
tree
2015-02-23
Tim Otten
CRM-15578 - crmMailing recipients - Filter on group_type...
commit
|
commitdiff
|
tree
2015-02-23
Tim Otten
CRM-15705 - crmMailingAB - Remove extra styling
commit
|
commitdiff
|
tree
2015-02-20
Tim Otten
Merge pull request #5202 from totten/master-civimail...
commit
|
commitdiff
|
tree
2015-02-20
Tim Otten
Merge pull request #5206 from jmcclelland/mailing-location...
commit
|
commitdiff
|
tree
2015-02-20
Tim Otten
CRM-15801 - crmMailing - Display the "Unsubscribe tracking...
commit
|
commitdiff
|
tree
2015-02-20
Tim Otten
CRM-15801 - crmMailing - Special formatting for recipients...
commit
|
commitdiff
|
tree
2015-02-20
Tim Otten
CRM-15801 - CiviMail - Change "Schedule/Send Mailing...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Disable broken graphs.
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Fix reload after submitting...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Display placeholder column...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Padding between sections...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Display job info
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
CRM-15979 - crmMailingAB - More symmetry between edit...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Only link to contact search...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
CRM_Core_Resources - Add API to export permission info
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Include all the major...
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - report.html - Loop over mailings
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - Use CSS file
commit
|
commitdiff
|
tree
2015-02-19
Tim Otten
crmMailingAB - Hyperlinks for stats. Get stats in a...
commit
|
commitdiff
|
tree
next