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 @ 1346:befaf13fec0d

# Date Author Comment
1346:befaf13fec0d 2013-06-21 03:05 PM Chris Cannam

I think we have room for 7 projects here, rather than 5

1345:1f9cdee56991 2013-06-21 11:43 AM Chris Cannam

Layout adjustments

1344:e5d5cb1bc3be 2013-06-21 11:19 AM Chris Cannam

Merge from branch cannam

1342:041b794f2a31 2013-06-21 11:12 AM Chris Cannam

Restore news to home page, tweak formatting

1341:90d09ace39bf 2013-06-20 02:54 PM Luis Figueira

Merge

1340:6aea63dac36e 2013-06-20 02:51 PM Luis Figueira

Using correct arguments on form builder helper.

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

1334:9397280c138c 2013-06-20 12:34 PM Chris Cannam

Restore route for enabling embedded docs through sys controller

1330:441b66f148b6 2013-06-20 11:32 AM Chris Cannam

HTML-safe the active colleagues box

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

1321:a7dcfc46fbe2 2013-06-19 03:19 PM Chris Cannam

More front page formatting

1319:5490d6392ee3 2013-06-19 02:44 PM Chris Cannam

Prepare simplification of front page

1305:097d38a73624 2013-06-14 11:30 AM Chris Cannam

Merge from branch cannam

1304:6137548ba453 2013-06-14 11:30 AM Chris Cannam

Add colleagues block to default My page layout

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

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

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)

1269:5e4f04bd7a1e 2013-05-02 03:43 PM Chris Cannam

edit renamed to update in controller

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

Mark intro text html safe

1247:1aee31f54e13 2013-04-03 03:28 PM Luis Figueira

Removed tag-realted hacky code from projects controller.

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.

1235:775d89567f41 2013-03-14 12:16 PM Chris Cannam

Converting fields_for ... :builder => TabularFormBuilder to labelled_fields_for seems like the thing to do

1234:e0167f4e1d8a 2013-03-13 02:00 PM Chris Cannam

We have a MyHelper now, so we need a MyHelperPatch (also some other minor fixes)

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"

1228:44475ccf56d3 2013-03-12 03:44 PM Chris Cannam

Merge from branch "live"

1227:eb168c1e9553 2013-03-12 03:45 PM Chris Cannam

Show maximum of 10 colleagues

1226:d280360758e5 2013-03-12 03:26 PM Chris Cannam

Fix dodgy merge, syntax, defaults

1225:edf7563e2653 2013-03-12 03:14 PM Chris Cannam

Merge from branch "cannam"

1224:30c444ea1338 2013-03-12 03:15 PM Chris Cannam

Various fixes to colleagues box

1222:2c59ee348e2b 2013-03-12 02:39 PM Chris Cannam

Logger, reinstate this box as default

1221:658b403da20a 2013-03-12 01:24 PM Chris Cannam

Merge

1219:3286032e15cf 2013-03-12 01:24 PM Chris Cannam

Some layout and fixes

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

Merge from branch "cannam"

1217:875b5b4c574d 2013-03-12 01:01 PM Chris Cannam

Add "People I'm working with" as My Page box -- currently off by default

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

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

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

1206:c63e31776f92 2013-01-23 11:59 AM Chris Cannam

Merge from branch cannam

1205:adb5f38f6ab7 2013-01-23 12:00 PM Chris Cannam

Pick up activity date from various different methods

1204:d24c22d420eb 2013-01-23 11:46 AM Chris Cannam

Merge from branch "cannam"

1203:74ad60b807ae 2013-01-23 11:47 AM Chris Cannam

Small wording and layout fix

1201:9ad0d37a49c9 2013-01-23 11:24 AM Chris Cannam

Merge from branch "live"

1200:fc5d582a25f9 2013-01-23 11:25 AM Chris Cannam

Fix internal error on homepage!

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

Merge from branch cannam

1198:6a7198536816 2013-01-23 11:08 AM Chris Cannam

Use a smaller font and tighter line spacing for long project names

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

Merge

1196:7a848374757b 2013-01-23 10:45 AM Chris Cannam

Override "My Projects" partial as used in My Page so as to show tags; ensure tags stylesheet is included

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

1192:3c9ca27c2d3d 2013-01-22 04:51 PM Chris Cannam

Add approximate back-of-envelope calculation of project maturity

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

1187:7f57e82048a4 2013-01-22 02:49 PM Chris Cannam

Merge

1186:e19f375f9afa 2013-01-22 02:49 PM Chris Cannam

Score activity to favour more recent events

1185:f37237021a46 2013-01-22 02:14 PM Chris Cannam

Merge

1184:1027f0f3a81a 2013-01-22 02:12 PM Chris Cannam

Make "busy projects" and "recent projects" look uniform

1183:820314b808cf 2013-01-21 04:23 PM Chris Cannam

Merge from branch cannam

1168:4d1a31b30987 2013-01-21 03:48 PM Chris Cannam

Remove nil projects before sorting

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

Merge from branch "feature_550"

1164:a943f341c99d 2013-01-21 02:12 PM Chris Cannam

Make "my projects" box on My Page look nice when user has no projects (invite them to create one)

1158:00e9a262ffe5 2013-01-15 04:08 PM Chris Cannam

Fix Javascript so as to update star properly

1156:2f6e71e31b55 2013-01-15 03:51 PM Chris Cannam

Minor adjustments

1155:a34a06ba1e33 2013-01-15 03:48 PM Chris Cannam

Provide a JS callback which should (?) be rendered by toggle_active ajax call

1154:651d2699348e 2013-01-15 03:45 PM Chris Cannam

Fix remote syntax for Rails 3 (doesn't work though); html safe in label

1152:5d01a630b843 2013-01-15 12:35 PM Chris Cannam

Fix to prior commit

1151:a3cb7444c9bd 2013-01-15 12:26 PM Chris Cannam

html output in parent project link

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

Fix rendering of project homepages with custom welcome pages

1142:7c3de6c7b7f5 2013-01-10 03:25 PM Chris Cannam

Syntax fixes

1140:59fd55892a7b 2013-01-10 03:23 PM Chris Cannam

Restore rendering of members list

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

Ensure generated HTML is marked as safe & thus rendered

1138:9e8213f2dfb3 2013-01-10 03:11 PM Chris Cannam

Restore missing open-div

1136:51d7f3e06556 2013-01-10 11:01 AM Chris Cannam

Fix "uninitialized constant Redmine::Scm::Adapters::CommandFailed" (see https://www.chiliproject.org/projects/chiliproject/repository/revisions/cbcce704006c6827b4a3134a2dda9de7c47f18ae)

1128:cd2db8872493 2013-01-09 11:25 AM Luis Figueira

Removed line from the Projects Controller that was mistakenly left after the merge from the pristine branch.

1120:55944e901e9e 2013-01-08 04:04 PM Luis Figueira

fixed a syntax error on an if/else statement.

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

1085:aef3ba0ca611 2012-11-23 01:34 PM Chris Cannam

Merge from branch "cannam"

1084:3b7e11eaf1ca 2012-11-23 01:34 PM Chris Cannam

Merge from branch "bug_531"

1083:0d837624e795 2012-11-22 06:10 PM Chris Cannam

If the file is large, acknowledge that it might be too large rather than binary (could be a big text file)

1082:997f6d7738f7 2012-11-22 06:04 PM Chris Cannam

In repo controller entry action, show the page for the file even if it's binary (so user still has access to history etc links). This makes it possible to use the entry action as the default when a file is clicked on

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