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 / models / project.rb @ 1297:0a574315af3e

History | View | Annotate | Download (35.7 KB)

# Date Author Comment
1297:0a574315af3e 2013-06-14 09:07 AM Chris Cannam

Merge from branch "redmine-2.2"

1295:622f24f53b42 2013-06-14 09:02 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.3-stable branch

1294:3e4c3460b6ca 2013-06-14 09:01 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.2-stable branch

1229:96790506f247 2013-03-13 10:48 AM Chris Cannam

Merge from branch "cannam"

1218:194867efafa9 2013-03-12 01:00 PM Chris Cannam

Merge from branch "cannam"

1215:2101a7c906b3 2013-03-12 10:29 AM Chris Cannam

Fix failure to truncate long descriptions without carriage returns in them correctly

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

937:9b10514b9248 2012-07-11 02:04 PM Luis Figueira

Merge from default (Redmine 1.3)

935:fe0249c097f6 2012-07-11 01:33 PM Chris Cannam

Merge from the default branch

933:d36724ef856a 2012-07-11 01:30 PM Chris Cannam

Merge from branch "cannam_integration"

931:ec1c49528f36 2012-06-27 03:04 PM Chris Cannam

Merge from branch "redmine-1.3"

929:5f33065ddc4b 2012-06-27 02:54 PM Chris Cannam

Update to Redmine SVN rev 9414 on 1.3-stable 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

913:b502ad91d302 2012-03-01 03:35 PM Luis Figueira

Fixes the deprecated use of visible_by.

912:5e80956cc792 2012-02-27 01:53 PM Chris Cannam

Merge from branch "redmine-1.3"

910:1f446682602c 2012-02-24 07:47 PM Chris Cannam

Merge from branch "cannam"

909:cbb26bc654de 2012-02-24 07:09 PM Chris Cannam

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

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"

689:a8e402f48723 2011-09-16 03:51 PM Chris Cannam

Merge from branch "live"

681:6bbcfcb85e50 2011-09-15 03:36 PM Chris Cannam

Transplant rev 65abc6b39292 from live branch

680:65abc6b39292 2011-09-14 02:26 PM Chris Cannam

Transfer custom welcome-page code from mainline to bibliography plugin code.
This is far too awkward. We need a better way.

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)

336:7f5bd8f2d79b 2011-03-30 11:05 AM Chris Cannam

Merge

335:7acd282bee3c 2011-03-30 11:05 AM Chris Cannam

Introduce render_project_short_description into projects helper; use it in welcome page (latest projects) as well as project lists, to avoid text formatting appearing in these lists

247:73ff0e6a11b1 2011-03-03 12:11 PM Chris Cannam
  • Merge from branch cannam-pre-20110113-merge
236:2241ff65dd33 2011-02-17 07:48 PM Chris Cannam

Merge from branch "live"

207:a6f87892f063 2011-02-08 01:14 PM Chris Cannam

Merge from branch "bug_67"

206:30203ffaa612 2011-02-08 12:20 PM Chris Cannam

Merge from branch "bug_67"

205:05f9a2a9c753 2011-02-08 12:16 PM Chris Cannam

Projects page: Sort and paginate table on the basis of root projects only; recurse to children (if any) after each root project is rendered. Fixes #67

150:857ac9ccf613 2011-01-24 02:18 PM Chris Cannam

Merge from branch "live"

136:bf38a7365edf 2011-01-19 03:34 PM Chris Cannam

Merge fixes for bug #51 and bug #35 from branch "cannam-pre-20110113-merge"

130:db0caa9f0ff4 2011-01-17 02:47 PM Chris Cannam

Make project descriptions briefer on the projects list, and ensure that images &c are removed from them

122:7c628fc7e91d 2011-01-17 02:47 PM Chris Cannam

Make project descriptions briefer on the projects list, and ensure that images &c are removed from them

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.
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
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859