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 @ 1524:82fac3dcf466

# Date Author Comment
1524:82fac3dcf466 2014-09-11 10:24 AM Chris Cannam

Fix failure to interpret Javascript when autocompleting members for project

1522:4449107c0f9b 2014-09-09 02:45 PM Chris Cannam

Restore members index action (never existed in vanilla Redmine, we added it)

1521:2354ddf5a483 2014-09-09 02:27 PM Chris Cannam

Fix some merge/runtime problems

1520:a1bdbf8a87d5 2014-09-09 10:02 AM Chris Cannam

Merge from branch "redmine-2.4-integration"

1519:afce8026aaeb 2014-09-09 09:34 AM Chris Cannam

Merge from branch "live"

1518:2e8063097240 2014-09-09 09:32 AM Chris Cannam

Merge from branch redmine-2.4

1517:dffacf8a6908 2014-09-09 09:29 AM Chris Cannam

Update to Redmine SVN revision 13367 on 2.5-stable branch

1516:b450a9d58aed 2014-09-09 09:28 AM Chris Cannam

Update to Redmine SVN revision 13356 on 2.4-stable branch

1512:96ca535049b3 2014-03-21 02:17 PM Chris Cannam

Merge from branch "live"

1511:e1cfd013ef49 2014-03-21 02:11 PM Chris Cannam

Fix #832 main page of a project should not have "Overview" as the first word of the html title

1510:ce4819fa2692 2014-03-21 02:00 PM Chris Cannam

Fix deprecation warning about passing a template handler in the template name

1509:fae089e1f1a3 2014-03-21 01:58 PM Chris Cannam

Layout fix

1508:a983b92b2fc1 2014-03-21 01:37 PM Chris Cannam

Merge from branch cannam

1507:9f37f7e39d3c 2014-03-21 01:37 PM Chris Cannam

Fixes to the prior commit

1506:fb773fcf9af8 2014-03-21 01:20 PM Chris Cannam

Go for unique managers only, not all members unique

1504:0fcf95cec435 2014-03-21 01:14 PM Chris Cannam

Merge from branch cannam

1503:523f55b47b98 2014-03-21 01:13 PM Chris Cannam

Whoops, call the right method why not

1502:cadec15c77d5 2014-03-21 01:03 PM Chris Cannam

Merge from branch "live"

1501:467282ce64a4 2014-03-21 01:03 PM Chris Cannam

Add varied-mature-projects Featured box

1499:1c7af51e9409 2014-03-21 09:07 AM Chris Cannam

Avoid showing institution "none" as busy

1495:c86dacc2ef0a 2014-03-17 08:55 AM Chris Cannam

Merge from redmine-2.4 branch

1494:e248c7af89ec 2014-03-17 08:54 AM Chris Cannam

Update to Redmine SVN revision 12979 on 2.4-stable branch

1491:cb53cb6eeaef 2014-03-17 08:56 AM Chris Cannam

Merge from default branch

1490:b1f6665080fd 2014-03-17 08:55 AM Chris Cannam

Merge from live branch

1485:c8d3ad483bea 2014-01-15 01:34 PM Chris Cannam

Fix stray merge markers

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

1463:274b89aabe38 2014-01-08 09:40 AM Chris Cannam

Merge

1461:926dce5f5778 2014-01-06 03:53 PM Chris Cannam

Merge fix from luisf branch

1459:cf78a7ade302 2013-11-11 06:25 PM Luis Figueira

Merge from branch "bug_794"

1458:b1f4c9a2af24 2013-11-11 06:25 PM Luis Figueira

Makes the default radio button checked by default -- this should fix bug #794.

1362:8633c9040b3b 2013-07-30 12:03 PM Luis Figueira

Merge from default branch

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

1357:bef3c810b1e4 2013-07-18 12:19 PM Chris Cannam

Merge from branch luisf

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

1350:bb6e7589720e 2013-07-12 12:33 PM Luis Figueira

Removes duplicate code introduced when integrating with redmine-2.2

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

Merge from live.

1348:0f5c32bfd33e 2013-07-03 09:57 AM Chris Cannam

Merge from branch "luisf"

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

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"