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 / config @ 438:34214e593c67

# Date Author Comment
438:34214e593c67 2011-06-06 01:32 PM Chris Cannam

Merge from branch bug_169

437:102056ec2de9 2011-06-06 01:31 PM Chris Cannam

Introduce a method on the sys controller to clear a repository cache; use a file in the mirror dir to notify the Ruby external repo script that it needs to call it

435:897979555864 2011-06-06 10:58 AM Chris Cannam

Merge from branch "live"

432:db5df568a7cf 2011-06-05 10:29 AM Chris Cannam

Refer to MATLAB docs as well as C++/Java

399:e7c58b88e670 2011-04-11 06:01 PM Chris Cannam

Merge from branch "feature_135"

398:c4a0942f2897 2011-04-11 06:03 PM Chris Cannam

Merge

397:aef15dbf2692 2011-04-11 06:03 PM Chris Cannam

Make the text slightly stronger still!

396:0f793aa84f75 2011-04-11 05:27 PM Chris Cannam

Merge from branch "feature_135"

395:59a5c4d96ff2 2011-04-11 05:28 PM Chris Cannam

Merge

394:7ba3ba2a0f63 2011-04-11 05:28 PM Chris Cannam

Make the Research Description description more descriptive (see #135)

377:0802551af0a5 2011-04-01 05:24 PM Chris Cannam

Merge from branch "feature_126"

375:773777b12fa1 2011-04-01 04:11 PM Chris Cannam

Merge

374:dcfde3922ec2 2011-04-01 04:11 PM Chris Cannam

Turn general News box on site front page into a Site News box (#126)

368:f3d8335d4e71 2011-04-01 12:13 PM Chris Cannam

Merge from branch "bug_127"

367:8da54f33a17b 2011-04-01 12:14 PM Chris Cannam

Merge

362:d1eb5d381a77 2011-04-01 11:41 AM Chris Cannam

Merge

361:30f68ecfdde4 2011-04-01 11:41 AM Chris Cannam

Formatting for Latest News box -- make it much more like the Recent Activity layout. Also adjust the date formatting in Latest Projects likewise.

359:9b25cd1b459b 2011-04-01 09:58 AM Chris Cannam

Merge from branch "live"

358:efa1e508bdef 2011-04-01 10:00 AM Chris Cannam

Minor editorial changes

356:debf12a566cd 2011-04-01 09:37 AM Chris Cannam

Merge from branch "feature_123"

355:9ccc63655a21 2011-04-01 09:37 AM Chris Cannam

Merge from branch "feature_123"

354:8c804ce943db 2011-04-01 09:37 AM Chris Cannam

Text and layout changes to try to clarify the Welcome page settings

352:13147268cd65 2011-03-31 06:21 PM Chris Cannam

Merge from branch "feature_123"

351:ebf53b46f3f3 2011-03-31 06:20 PM Chris Cannam

Add the overview setting to the project settings. Still rather clumsy, but it does appear to work!

348:8d0e011332ef 2011-03-31 03:23 PM Chris Cannam

Merge from branch "feature_122"

346:712264d5d60a 2011-03-31 03:21 PM Chris Cannam

Merge

344:1a514b9347d4 2011-03-31 03:19 PM Chris Cannam

Add Recent Activity partial, include it as a block in My Page (on by default) and in the project information page

322:eabb08b4afc3 2011-03-29 10:50 AM Chris Cannam

Merge from branch "bug_70"

321:1fbfab2f1624 2011-03-29 10:49 AM Chris Cannam

Merge from branch "bug_70"

319:614862ec2481 2011-03-29 10:44 AM Chris Cannam

Show checkout permissions message only when user logged in; some tidying and layout

318:f7c525dc7585 2011-03-28 06:17 PM Luis Figueira

Merge from branch "live"

315:fd027311814a 2011-03-28 06:05 PM Chris Cannam

Merge from branch "live"

314:c80103b81194 2011-03-28 06:05 PM Chris Cannam

Merge from branch "feature_117"

313:862e47cc1e09 2011-03-28 06:04 PM Chris Cannam

Merge from branch "bug_97"

312:8019c250165b 2011-03-28 05:50 PM Chris Cannam

Merge from branch "feature_115"

310:b9c2ba9e49b4 2011-03-28 05:50 PM Chris Cannam

Merge from branch "feature_73"

308:766ad4e52e6e 2011-03-28 05:41 PM Chris Cannam

Merge from branch "feature_117"

307:c7d3b58bd01c 2011-03-28 05:41 PM Chris Cannam

Produce a single en.yml which contains British texts but describes itself as just English.
The difference between en and en-GB is minimal for this application, apart from date formats, and the pain in maintaining both is significant. See #117 and #58.

305:f5a3d57f3d90 2011-03-28 05:33 PM Chris Cannam

Merge from branch "feature_115"

304:6c56a595dc1c 2011-03-28 05:32 PM Chris Cannam

Merge from branch "feature_73"

303:93b4cfd3aaaa 2011-03-28 05:30 PM Chris Cannam

Merge from branch "bug_97"

302:6508e99869a2 2011-03-25 03:07 PM Chris Cannam

Add a note explaining that the repo is external (if relevant) and giving its URL (do we want this?)

299:defe55be97b9 2011-03-24 03:48 PM Chris Cannam

Do not show external checkbox/field until the repo has been automatically populated
Pull external Hg as well as git and svn repos
Some textual changes

295:3b367754d2b0 2011-03-24 01:00 PM Luis Figueira

merge from branch bug_97

294:ba87afa76607 2011-03-24 12:52 PM Luis Figueira

fixed template variable problems; created subject label; fixed old labels

293:b133cb3ce3b1 2011-03-24 10:04 AM Luis Figueira

new format for label variables.

292:5f4ac0a159fa 2011-03-23 10:22 PM Luis Figueira

DEV commit: created template; need to solve bug in template variables.

290:4d4acbad8728 2011-03-23 05:36 PM Chris Cannam

Textual changes

289:2de308601155 2011-03-23 11:33 AM Chris Cannam

Merge from branch "bug_95"

284:23c69f60a959 2011-03-23 11:19 AM Chris Cannam

Merge from branch "bug_95"

282:f7e79424e753 2011-03-22 02:16 PM Luis Figueira

merge from branch bug_95

280:d242e28efb23 2011-03-22 02:14 PM Luis Figueira

merge from feature_72

279:782d4fc319bb 2011-03-21 06:02 PM Luis Figueira

added the description; changed the roles labels. minor fixes to layout.

277:ab672e427b9b 2011-03-21 04:02 PM Chris Cannam

Merge from branch "feature_72"

275:ec56461d3770 2011-03-21 02:40 PM Luis Figueira

the status messages now depend on the repository type.

264:7b74f431bdab 2011-03-04 04:04 PM Chris Cannam

Merge from branch "feature_80"

263:797be8798817 2011-03-04 04:02 PM Chris Cannam

Add "translation"

262:f936ec3cb58a 2011-03-04 03:06 PM Chris Cannam

Merge from branch "feature_80"

261:1d51c9df069b 2011-03-04 03:03 PM Chris Cannam

Merge from branch "feature_80"

260:847add61573b 2011-03-04 03:03 PM Chris Cannam
  • Add some text explaining active toggle function; show it only where there's at least one file in the list
259:a5d526f6d88a 2011-03-04 02:55 PM Chris Cannam
  • Remove obsolete line
257:3ecf99348b9f 2011-03-04 12:46 PM Chris Cannam
  • Enable toggling file active state through the files interface
254:0c9da2b87ad6 2011-03-03 06:31 PM Chris Cannam

Naively display download "active" status in downloads page, and allow sorting by it

250:c90c42a771ec 2011-03-03 02:38 PM Chris Cannam
  • Restore further things broken during merge
248:3bcfbf971c40 2011-03-03 12:23 PM Chris Cannam
  • Fix some things broken during merge
247:73ff0e6a11b1 2011-03-03 12:11 PM Chris Cannam
  • Merge from branch cannam-pre-20110113-merge
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)

240:6c282df74a30 2011-02-22 04:50 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"

238:83bf35c4f9d1 2011-02-18 10:02 AM Chris Cannam

Merge from branch "bug_83"

236:2241ff65dd33 2011-02-17 07:48 PM Chris Cannam

Merge from branch "live"

235:61f66ddb0b65 2011-02-17 07:48 PM Chris Cannam

Merge from branch "live"

232:e77e267057c8 2011-02-17 07:10 PM Chris Cannam

Merge from branch "feature_20" (initial implementation of #20).

231:5d6e2819f3dd 2011-02-17 06:35 PM Chris Cannam

Merge from branch "feature_20". This initial implementation of #20 has been tested, but needs to be tested again in the proper context.

229:344f68e4b103 2011-02-17 04:43 PM Chris Cannam

Merge from branch "luisf". This merges the label change from Files to Downloads

227:5f386daac32d 2011-02-17 04:33 PM Luis Figueira

renamed files to downloads

221:984e4ee774f1 2011-02-10 01:43 PM Chris Cannam

Merge from branch "feature_75"

220:3fecad619aa3 2011-02-10 01:43 PM Chris Cannam
  • Ensure route requires post action
218:292cde42265a 2011-02-11 04:21 PM Chris Cannam
  • Enable Embedded on projects that have new documentation
214:e0cbb39c0429 2011-02-10 02:40 PM Chris Cannam
  • Add method to retrieve external repo URL (via /sys/projects/<id>/external-repository.xml?key=<key>)
210:0579821a129a 2011-02-08 01:51 PM Chris Cannam

Update to Redmine trunk rev 4802

209:ff5112f823e5 2011-02-08 01:24 PM Chris Cannam

Merge from branch "feature_72", to provide just enough of the site support for external repos to permit testing while developing the conversion code

204:6849e7b210c7 2011-02-07 05:20 PM Luis Figueira

text field for external repo URL

201:61d8fba252fd 2011-02-07 04:04 PM Luis Figueira

external repository check box.

200:abc11f2ead72 2011-02-07 02:21 PM Chris Cannam

Add some missing GB "translations"

199:55c3f4afe85d 2011-02-07 02:17 PM Chris Cannam

Merge from branch "live"

198:5d8c3fe4e7e2 2011-02-07 02:16 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge". Brings in table reorganisation for Projects page; moves our scripts from extra/svn to extra/soundsoftware; reduces page min-width

197:5da98461a9f6 2011-02-07 02:13 PM Chris Cannam

Merge from branch "live"

196:2eaccf99a7b0 2011-02-07 02:07 PM Chris Cannam

Merge from branch "live"

195:172b8d25c1ae 2011-02-07 01:47 PM Chris Cannam

Merge from branch "feature_64"

194:c56dcdfe6722 2011-02-07 01:16 PM Chris Cannam

Merge from branch "feature_64"

193:90cc857e968a 2011-02-07 12:52 PM Luis Figueira

Merge from branch "feature_64"

192:d1713ab10813 2011-02-07 12:30 PM Luis Figueira

feature_64: link to terms and conditions wiki page; fixed form resubmission bug.

190:440c4f4bf2d6 2011-02-03 05:11 PM Luis Figueira

created the model validation and the checkbox in the registration view.

184:b46db3a8b1b4 2011-02-03 03:15 PM Chris Cannam

Merge from branch "feature_55"

174:97d27ad3df50 2011-02-02 12:18 PM Chris Cannam

Merge from branch "feature_75". Should have merged 5 commits ago. Oops

163:9a5a265e77f0 2011-01-31 06:10 PM Luis Figueira

labels correctly named
institution field is now mandatory and validated.

156:9d2c8317d42f 2011-01-27 02:53 PM Chris Cannam
  • Add method to WS API controller to permit Embedded plugin to be switched on or off for a project (via /sys/projects/<id>/embedded.xml?key=<key>&enable={0,1})
155:1ca23eedd587 2011-01-27 11:04 AM Chris Cannam
  • More helpful names for the project modules -- especially the Embedded module