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 / projects @ 1361:7c0909052511

# Date Author Comment
1361:7c0909052511 2013-07-18 12:21 PM Chris Cannam

Merge from live branch

1360:45dbcd39b9e9 2013-07-18 12:21 PM Chris Cannam

Merge from branch cannam

1358:b8f94812d737 2013-07-18 12:20 PM Chris Cannam

Merge from branch bug_635

1356:a6a25685e5a6 2013-07-18 12:19 PM Chris Cannam

Merge from live branch

1355:3d01be97cb5a 2013-07-18 12:13 PM Chris Cannam

Fix routes and safe attributes for the external repo settings

1354:fc0fecf09eb9 2013-07-18 11:18 AM Chris Cannam

Restore our original repos settings page. But I don't think this is going to work well with the new routes configuration

1349:4ff3f8b81ab3 2013-07-11 05:32 PM Luis Figueira

Merge from live.

1347:f1fb4091d7f3 2013-06-21 03:05 PM Chris Cannam

expires_in doesn't do what I thought here, we have external expiry job instead

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!

1322:596e34bffcc7 2013-06-19 04:18 PM Chris Cannam

Temporarily remove "Mature projects", it doesn't work well enough. Add Search Projects link

1303:537026b96b8b 2013-06-14 11:12 AM Chris Cannam

Merge from branch cannam

1302:f9a81a1a4425 2013-06-14 11:11 AM Chris Cannam

Add "all projects" link to explore page

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

1273:052ea7c838f6 2013-05-09 11:49 AM Luis Figueira

Merge cannam's latest changes.

1268:2818bf60c84c 2013-05-02 12:48 PM Chris Cannam

Mark intro text html safe

1245:d8e15cc24494 2013-03-27 03:37 PM Luis Figueira

fixed the project _overview form_for (had one extra parameter); created route for a project's settings.

1240:045e5984313c 2013-03-26 03:50 PM Luis Figueira

Added a few more css classes to the rest of the new Project view.

1239:e726dca6f7bd 2013-03-26 03:48 PM Luis Figueira

html_safe'd identifier; added info class.

1238:90a0ed1ca8cb 2013-03-26 03:47 PM Luis Figueira

Fixed project_is_public_1 label.

1232:345e08eee166 2013-03-13 01:06 PM Chris Cannam

Some fixes from comparing plugin views to core app views

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"

1213:17305097e652 2013-03-12 10:21 AM Chris Cannam

Three-column explore layout

1210:16826c3afbba 2013-01-23 01:15 PM Chris Cannam

Merge from branch "live"

1209:1b1138f6f55e 2013-01-23 01:11 PM Chris Cannam

Merge from branch live

1208:e60f4ccfdc70 2013-01-23 12:01 PM Chris Cannam

Merge from branch "cannam"

1207:d6d53a77f058 2013-01-23 12:02 PM Chris Cannam

Add overlooked file

1199:bae194c52296 2013-01-23 11:10 AM Chris Cannam

Merge from branch cannam

1197:ba189cfe5aaf 2013-01-23 10:45 AM Chris Cannam

Merge

1194:6676c0284df2 2013-01-22 05:03 PM Chris Cannam

Add "mature projects" box. This isn't good enough on its own, it's just a test -- we need this to inform other relationships

1193:d67ed1030451 2013-01-22 04:54 PM Chris Cannam

Add new-project link to Explore page

1190:91db8e091f10 2013-01-22 03:45 PM Chris Cannam

Remove My Projects from projects list (now in My Page)

1189:3e874cee63af 2013-01-22 03:45 PM Chris Cannam

Layout adjustments to explore boxes

1165:6a10e5fbf8b2 2013-01-21 02:17 PM Chris Cannam

Merge from branch "feature_550"

1143:908e97507ef8 2013-01-10 03:30 PM Chris Cannam

Fix rendering of project homepages with custom welcome pages

1139:5e476516ffea 2013-01-10 03:11 PM Chris Cannam

Ensure generated HTML is marked as safe & thus rendered

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

1096:8b57fd618c84 2012-11-29 02:38 PM Luis Figueira

Merge

1091:3d387b121e85 2012-11-26 05:39 PM Luis Figueira

Merge

1086:5ebdeb79ea9c 2012-11-23 02:29 PM Chris Cannam

Add "My Page" box for my projects. Currently this also affects the layout of the non-My-Page version of the My Projects list, need to adjust that

1081:b56a4c5afa35 2012-11-22 05:26 PM Chris Cannam

Merge from branch cannam

1078:b9e34a051f82 2012-11-21 05:56 PM Chris Cannam

Merge from live branch

1063:6f464526403b 2012-11-19 07:57 PM Luis Figueira

Merge

1061:01076ed49ffc 2012-11-19 07:50 PM Luis Figueira

Merge from live site's latest changes.

1042:26a835cb14f9 2012-11-13 03:39 PM Chris Cannam

Merge from branch cannam

1041:af23bcbbd911 2012-11-13 03:38 PM Chris Cannam

Pull header stuff out of cached fragments

1040:ff783f2cc500 2012-11-13 03:08 PM Chris Cannam

Merge from branch cannam

1039:f6c71883b995 2012-11-13 03:07 PM Chris Cannam

More layout fixes

1035:4ac34b54f946 2012-11-13 02:00 PM Chris Cannam

Merge

1034:ea5d9652c6f6 2012-11-13 02:00 PM Chris Cannam

Fix bug #370: Use radio buttons instead of a checkbox for project public/private selection

1033:13a8e4ac88d5 2012-11-13 12:10 PM Chris Cannam

Don't want "Create and Continue" when creating a new project

1032:ff1556010d8b 2012-11-13 12:06 PM Chris Cannam

Expiry. Wonder whether this works.

1031:873d052b361b 2012-11-13 10:37 AM Chris Cannam

Merge from browsing branch

1027:b0e0ffb43fa1 2012-11-13 01:25 PM Luis Figueira

Merge

1026:b42553f6df71 2012-11-13 01:23 PM Luis Figueira

Merge

1025:02ee54197879 2012-11-13 12:10 PM Luis Figueira

Merge

1021:967fb7e62b1d 2012-11-13 10:35 AM Chris Cannam

Include only public projects in busy institutions / projects queries, so results can be cached (the tag cloud was already public projects only). Introduce tentatively some cacheing thingies

1015:52be96e83080 2012-11-12 03:17 PM Chris Cannam

Merge from branch "live"

1012:bbca6f4eebc7 2012-11-12 02:40 PM Chris Cannam

Merge from branch "browsing"

1010:76a677c96bce 2012-11-12 02:22 PM Chris Cannam

Layout bits

1009:066b55d7c053 2012-11-12 01:34 PM Chris Cannam

Add busy institutions list

1007:3e52bc15dd67 2012-11-09 08:04 PM Chris Cannam

Add browse page stub

1006:4ffe9098c16c 2012-11-09 05:41 PM Chris Cannam

Busy-projects partial, etc

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

918:04114f36670d 2012-03-06 02:07 PM Chris Cannam

Rename .erb to .html.erb in line with the convention

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.

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

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)

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

838:1b3e19345cf5 2012-02-01 11:16 AM Luis Figueira

Merge from branch "cannam"

834:6f5c0ac92d72 2012-02-01 10:48 AM Chris Cannam

Merge from branch "cannam"

830:f87006561e09 2012-01-31 01:46 PM Chris Cannam

Merge

829:7a613c0eefe2 2012-01-31 01:45 PM Chris Cannam

Hide tracker options in the new-project version of the project settings form

828:f31a4cea8c05 2012-01-31 01:41 PM Chris Cannam

Merge

827:bbe339e5eba1 2012-01-31 01:40 PM Chris Cannam

Clarify some new-project descriptive texts

823:73057b65abcb 2011-12-16 03:17 PM Chris Cannam

Merge

812:b5474c68c433 2011-11-23 03:29 PM Luis Figueira

Merge from branch "live"

811:b4e59a60b447 2011-11-23 01:58 PM Chris Cannam

Merge from branch "cannam"

810:aaa26ccafb00 2011-11-23 01:57 PM Chris Cannam

Move tags list on project show page

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"

641:b4e9410882f1 2011-09-06 12:24 PM Chris Cannam

Merge from branch "cannam"

634:eaec823e6e23 2011-09-06 09:47 AM Chris Cannam

Merge from branch "cannam"

588:91389d8bbdea 2011-08-12 02:40 PM Chris Cannam

Merge from bug_255

587:edce3dafd217 2011-08-12 02:40 PM Chris Cannam

Some text changes to fix #255