To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.

Statistics Download as Zip
| Branch: | Tag: | Revision:

root / app / views / mailer @ 1591:63650ae64bf2

# Date Author Comment
1527:c3edf97ea198 2014-09-11 12:46 PM Chris Cannam

Merge from live branch
1526:404aa68d4227 2014-09-11 12:46 PM Chris Cannam

Merge from live branch
1525:fb9a13467253 2014-09-11 12:45 PM Chris Cannam

Merge from branch redmine-2.5-integration
1520:a1bdbf8a87d5 2014-09-09 10:02 AM Chris Cannam

Merge from branch "redmine-2.4-integration"
1484:51364c0cd58f 2014-01-15 09:59 AM Chris Cannam

Merge from live branch. Still need to merge manually in files overridden by plugins.
1464:261b3d9a4903 2014-01-14 02:37 PM Chris Cannam

Update to Redmine 2.4 branch rev 12663
1339:c03a6c3c4db9 2013-06-20 02:34 PM Luis Figueira

Merge
1338:25603efa57b5 2013-06-20 01:14 PM Chris Cannam

Merge from live branch
1337:077b8890835a 2013-06-20 01:14 PM Chris Cannam

Merge from live branch
1329:b2ea0641f798 2013-06-20 08:47 AM Chris Cannam

Merge from redmine-2.2-integration branch. We're going live!
1273:052ea7c838f6 2013-05-09 11:49 AM Luis Figueira

Merge cannam's latest changes.
1270:b2f7f52a164d 2013-05-02 04:24 PM Chris Cannam

Fix project members page: update editlist partial following changes to project member settings partial; update mailer class and templates; make editlist forms not be remote (we just reload page)
1116:bb32da3bea34 2013-01-07 02:41 PM Chris Cannam

Merge from live
1115:433d4f72a19b 2013-01-07 12:01 PM Chris Cannam

Update to Redmine SVN revision 11137 on 2.2-stable branch
940:9fda6880be81 2012-07-11 02:35 PM Chris Cannam

Merge from the default branch
935:fe0249c097f6 2012-07-11 01:33 PM Chris Cannam

Merge from the default branch
927:9ee5fd0b9bd3 2012-05-11 04:13 PM Luis Figueira

Merge from cannam_integration
926:b73a59a6acbd 2012-05-11 04:10 PM Luis Figueira

Merge from cannam_integration
917:66ac47c3719b 2012-03-06 02:05 PM Chris Cannam

Rename .text.html.erb and .text.plain.erb to .html.erb and .text.erb in line with the other mailer files
915:2a68662d5adf 2012-03-02 12:37 PM Luis Figueira

needs further testing Moved several files' extension to ".erb"; modified two files because they were calling partials/templates with rhtml extensions; renamed email templates sent when a user is added to a publication.
914:af7a3f452778 2012-03-02 11:44 AM Luis Figueira

renamed the email templates used when adding users to a project.
912:5e80956cc792 2012-02-27 01:53 PM Chris Cannam

Merge from branch "redmine-1.3"
911:487d96eac004 2012-02-24 08:18 PM Chris Cannam

Remove .svn directories from subdirectories in preparation for merging from newer svn repo format
909:cbb26bc654de 2012-02-24 07:09 PM Chris Cannam

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
908:c6c2cbd0afee 2012-02-24 06:36 PM Chris Cannam

Rename .rhtml files to .html.erb in preparation for merge
907:df51e8ff578d 2012-02-24 06:29 PM Chris Cannam

Remove .svn directories from subdirectories in preparation for merging from newer svn repo format
524:1248a47e81b3 2011-07-25 02:39 PM Luis Figueira

Merge from branch "luisf"
523:0b6c82dead28 2011-07-25 02:23 PM Luis Figueira

Merge from branch "cannam"
514:7eba09d624db 2011-07-14 10:50 AM Chris Cannam

Merge
511:107d36338b70 2011-07-14 10:43 AM Chris Cannam

Merge from branch "cannam"
510:1afe06d9ba94 2011-07-14 10:42 AM Chris Cannam

Merge from branch "cannam"
508:851510f1b535 2011-07-14 10:37 AM Chris Cannam

Merge from branch "redmine-1.2"
507:0c939c159af4 2011-07-14 10:32 AM Chris Cannam

Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
443:350acce374a2 2011-06-06 02:55 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"
442:753f1380d6bc 2011-06-06 02:41 PM Chris Cannam

Merge from branch "redmine-1.2"
441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
313:862e47cc1e09 2011-03-28 06:04 PM Chris Cannam

Merge from branch "bug_97"
303:93b4cfd3aaaa 2011-03-28 05:30 PM Chris Cannam

Merge from branch "bug_97"
295:3b367754d2b0 2011-03-24 01:00 PM Luis Figueira

merge from branch bug_97
294:ba87afa76607 2011-03-24 12:52 PM Luis Figueira

fixed template variable problems; created subject label; fixed old labels
292:5f4ac0a159fa 2011-03-23 10:22 PM Luis Figueira

DEV commit: created template; need to solve bug in template variables.
246:eeebe205a056 2011-03-03 12:02 PM Chris Cannam
  • Merge from default branch, bringing us up to SVN trunk rev 4993
245:051f544170fe 2011-03-03 11:42 AM Chris Cannam
  • Update to SVN trunk revision 4993
243:0c38ffddde77 2011-03-03 11:08 AM Chris Cannam

Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
210:0579821a129a 2011-02-08 01:51 PM Chris Cannam

Update to Redmine trunk rev 4802
129:5e974759e8b2 2011-01-19 03:15 PM Chris Cannam

Merge from the default branch
128:07fa8a8b56a8 2011-01-19 03:04 PM Chris Cannam

Update to Redmine trunk rev 4732
120:cd2282d2aa55 2011-01-13 02:33 PM Chris Cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
119:8661b858af72 2011-01-13 02:12 PM Chris Cannam
  • Update to Redmine trunk rev 4705
118:b859cc0c4fa1 2011-01-13 01:21 PM Chris Cannam

Merge from branch "redmine-1.1"
117:af80e5618e9b 2011-01-13 12:53 PM Chris Cannam
  • Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
96:98b2834d136b 2010-12-16 01:29 PM Chris Cannam

Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
84:432bb11e0390 2010-12-16 10:03 AM Chris Cannam

Merge from branch "luisf"
83:387ad4f40686 2010-12-15 04:55 PM Luis Figueira

Feature #53: minor formatting changes to the HTML version.
82:c71f2900168f 2010-12-15 04:51 PM Luis Figueira

Feature #53: User's name and email address also shown in email.
81:b5fbd125d70b 2010-12-15 04:17 PM Luis Figueira

Feature #53: Minor changes in email formatting.
80:0a679b5bd3b3 2010-12-15 04:13 PM Luis Figueira

Feature #53: Added the description to the admin's email. May need future fixes in terms of format (HTML and Plain text mail versions).
51:371eac10df0b 2010-11-24 12:20 PM Chris Cannam
  • Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
41:7f0e922c8982 2010-11-19 02:45 PM Luis Figueira

merged with new version from trunk
38:33d69fee1d99 2010-11-19 01:41 PM Chris Cannam
  • Merge SVN update from default branch
37:94944d00e43c 2010-11-19 01:24 PM Chris Cannam
  • Update to SVN trunk rev 4411
25:9fd6221709a6 2010-09-24 03:51 PM Chris Cannam
  • Merge cannam branch
23:ca82a3468d27 2010-09-24 02:17 PM Chris Cannam
  • Merge SVN update from default
22:40f7cfd4df19 2010-09-24 02:06 PM Chris Cannam
  • Update to SVN trunk rev 4173
15:9c6c72729d91 2010-08-25 04:33 PM Chris Cannam
  • Merge from default (for SVN trunk update)
14:1d32c0a0efbf 2010-08-25 04:30 PM Chris Cannam
  • Update to SVN trunk (revisions 3892-4040)
1:cca12e1c1fd4 2010-07-28 12:08 PM Chris Cannam
  • Update to Redmine trunk (SVN revisions 3860-3892)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859