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 / controllers @ 441:cbce1fd3b1b7

# Date Author Comment
441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)

440:6253d777aa12 2011-06-06 01:34 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge". Includes fix for bug #169.

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

422:19549b0c417a 2011-05-10 12:00 PM Chris Cannam

Merge from branch bug_133

419:c759f8787b07 2011-05-10 11:39 AM Chris Cannam

Merge

418:a9921f3e9088 2011-05-10 11:39 AM Chris Cannam

Use all with ordering instead of sort_by for projects (fixes #133)

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)

370:055518fc4e4c 2011-04-01 12:14 PM Chris Cannam

Merge from branch "feature_125"

369:a70a6b9df76b 2011-04-01 12:13 PM Chris Cannam

Merge from branch "feature_124"

366:3e8c33cbb8e0 2011-04-01 12:13 PM Chris Cannam

Merge

365:7d8567890fa3 2011-04-01 12:11 PM Chris Cannam

Redirect to My Page instead if asked to redirect to home page

364:7a616ddc3331 2011-04-01 12:03 PM Chris Cannam

Merge

363:ce85aa993384 2011-04-01 11:56 AM Chris Cannam

Add Tip of the Day as a block for My Page (on by default)

357:3ca3a0255e2a 2011-04-01 09:38 AM Chris Cannam

Merge from branch "live"

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

Merge from branch "feature_123"

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

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

326:2cf35a3bc0c5 2011-03-29 11:42 AM Chris Cannam

Flip sort ordering

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"

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

Merge from branch "bug_97"

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

Merge from branch "feature_73"

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"

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

merge from branch bug_97

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

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

291:f3b2dc533e83 2011-03-23 05:38 PM Luis Figueira

added feature to send mails to user when added to project; TODO: need to create template.

288:8b569484ba95 2011-03-23 11:33 AM Chris Cannam

Merge from branch "bug_99"

283:8746576e96b8 2011-03-23 10:41 AM Chris Cannam

Merge from branch "bug_99"

281:00d9b68a4047 2011-03-22 02:15 PM Luis Figueira

merge from bug_99

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

merge from feature_72

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

Merge from branch "feature_72"

276:184242238f4d 2011-03-21 03:31 PM Luis Figueira

Commented the popup dialogue line.

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

the status messages now depend on the repository type.

274:4d493e74dcfc 2011-03-21 01:31 PM Luis Figueira

creates a Mercurial Repository by default.

273:c09865a48f4e 2011-03-21 01:18 PM Luis Figueira

TEST DEV commit: creates the repository automatically;

272:f89f7331fc00 2011-03-17 05:44 PM Luis Figueira

repository scm not showing anymore.

265:f4a7c5aebbb5 2011-03-04 04:12 PM Chris Cannam

Sort files with active first, by default

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"

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

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"

239:7cec015f07ce 2011-02-22 04:48 PM Chris Cannam

Merge from branch "live"

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

Merge from branch "bug_83"

237:4b1a23d81683 2011-02-18 09:58 AM Chris Cannam

When redirecting after login, if the current request URL is an https URL, ensure the back_url is too

236:2241ff65dd33 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.

219:55468f2fd4ad 2011-02-14 03:01 PM Luis Figueira

dev commit

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>)
213:00e958b1f6f8 2011-02-09 04:22 PM Luis Figueira

DEV commit: working in the repository config tab

210:0579821a129a 2011-02-08 01:51 PM Chris Cannam

Update to Redmine trunk rev 4802

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

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.

189:b55279e641b8 2011-02-03 03:55 PM Chris Cannam

Merge from branch "feature_55"

188:f9fe5ef6156e 2011-02-03 03:54 PM Luis Figueira

fixed bugs with validation of forms.

187:752184172a34 2011-02-03 03:34 PM Chris Cannam

Merge from branch "feature_55"

185:594ed6aef7bd 2011-02-03 03:31 PM Luis Figueira

fixed issue with users with no entry in the ssamr_user_details_table.
added javascript for those users in the my/account 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

169:bc23796a7120 2011-02-01 05:50 PM Luis Figueira

ssamr validation on my/account is now done correctly
other small bug fixes.

164:bb9724ba3d60 2011-01-31 08:59 PM Luis Figueira

my account view working correctly.

161:bad82329a115 2011-01-31 01:41 PM Luis Figueira

new javascript for institution field handling.

160:7eb2194ee428 2011-01-28 06:44 PM Luis Figueira

. institution field correctly handled in the user edit and show forms, and in the register view;

158:e71a969c151a 2011-01-27 06:46 PM Luis Figueira

migration with new "institution_type" column in ssamr_user_details table.

radio buttons now rely on database

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})
153:6bd9b26ebd07 2011-01-25 02:57 PM Luis Figueira

DEV commit - added new logic and view details.

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

Merge from branch "live"

149:e7c03e1738fb 2011-01-24 02:12 PM Chris Cannam

Merge from branch "live"

145:e80647437550 2011-01-20 01:08 PM Luis Figueira

Issue #31: issue submitters and assignees are added to the watchers list.
incomplete: there is no option to select/unselect the assignee.

142:e6ed6c7a2ce9 2011-01-20 02:06 PM Luis Figueira

corrected bug in the institution field while creating a new user.

141:ab75f33dcc6f 2011-01-20 01:08 PM Luis Figueira

Issue #31: issue submitters and assignees are added to the watchers list.
incomplete: there is no option to select/unselect the assignee.

139:ddcedb549d4e 2011-01-20 10:00 AM Chris Cannam

Merge from live branch

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

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

135:6a2f8e88344e 2011-01-19 01:27 PM Chris Cannam

Bug #51: make New Member box show matching users only when at least 2 characters have been typed in search (avoid really long results lists)

133:1890a968b404 2011-01-18 05:22 PM Chris Cannam
  • Show Public or Private next to my projects; fix ordering of my projects so as to retain hierarchy
132:ab611b7c7ecc 2011-01-18 05:02 PM Chris Cannam

Make the project list into a sortable table with a little more information in it

131:513e61d1b4da 2011-01-17 05:22 PM Chris Cannam

Start work on paginating and refining project list layout

129:5e974759e8b2 2011-01-19 03:15 PM Chris Cannam

Merge from the default branch

128:07fa8a8b56a8 2011-01-19 03:04 PM Chris Cannam

Update to Redmine trunk rev 4732

127:32b5adec7422 2011-01-19 01:27 PM Chris Cannam

Bug #51: make New Member box show matching users only when at least 2 characters have been typed in search (avoid really long results lists)

125:ca48d8b6f55d 2011-01-18 05:22 PM Chris Cannam
  • Show Public or Private next to my projects; fix ordering of my projects so as to retain hierarchy