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 / settings @ 1298:4f746d8966dd

# Date Author Comment
1298:4f746d8966dd 2013-06-14 09:28 AM Chris Cannam

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
1295:622f24f53b42 2013-06-14 09:02 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.3-stable branch
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
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
723:d41bf754c0f2 2011-10-20 04:36 PM Luis Figueira

Merge from branch "live"
695:1710ec37bb6a 2011-09-16 06:40 PM Luis Figueira

Merge from branch "feature_36"
688:1f488f375d64 2011-09-16 03:49 PM Chris Cannam

Merge from branch "live"
662:cd9499a11381 2011-09-09 04:34 PM Chris Cannam

Merge from branch "cannam"
641:b4e9410882f1 2011-09-06 12:24 PM Chris Cannam

Merge from branch "cannam"
637:efdb97a8286c 2011-09-06 12:07 PM Chris Cannam

Restore Tip of the Day settings entry lost during merge of rev cd2282d2aa55
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)
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)
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)
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.
50:97333e644a2c 2010-11-23 03:59 PM Chris Cannam

Merge
47:22ae926000f9 2010-11-23 12:47 PM Luis Figueira

Added Notifications Area in Welcome page.
Minor changes to welcome page layout;
46:9c8afcb2f7e5 2010-11-23 12:32 PM Luis Figueira

The Tip of the day box in the settings pane now has the wiki edit buttons.
45:65d9e2cabaa3 2010-11-23 11:50 AM Luis Figueira

Added tipoftheday to the config/settings in order to correct previous issues.
Tip of the day is now working correctly.
Added the heading strings to the locales files.
44:6c19f4f0542c 2010-11-22 03:28 PM Luis Figueira

Corrected small bug.
43:662737751997 2010-11-22 03:21 PM Luis Figueira

Added "welcome text" style "Tip of the day" feature.
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