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 / helpers @ 969:e632838adb35

# Date Author Comment
969:e632838adb35 2012-10-17 10:42 AM Chris Cannam

Merge from branch "live"

968:6b978669cdac 2012-10-17 10:42 AM Chris Cannam

Merge from branch "bug_521"

967:19884e9d5eff 2012-10-17 10:42 AM Chris Cannam

Only count downloads from non-bots

956:fa2a1b6cda26 2012-10-16 03:25 PM Chris Cannam

Merge from branch "live"

955:97a00e2e145d 2012-10-16 03:25 PM Chris Cannam

Merge from branch "live"

954:42e2437766c2 2012-08-29 03:55 PM Chris Cannam

Merge from branch "bug_505"

950:64d990177cda 2012-08-02 07:41 PM Luis Figueira

Merge (Bug #505 fix).

948:83866d58f2dd 2012-08-02 06:42 PM Luis Figueira

Makes explicit that the "user" is a Group.

944:03975ec7378d 2012-07-11 02:43 PM Luis Figueira

Merge

941:6d4cafba9468 2012-07-11 02:36 PM Chris Cannam

Merge from the default branch

940:9fda6880be81 2012-07-11 02:35 PM Chris Cannam

Merge from the default branch

939:1affbc7f4b30 2012-07-11 02:35 PM Chris Cannam

#501 "new projects" on front page should list hierarchy for non-top-level projects
#493 Projects box in front page should label private projects as such

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

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)

907:df51e8ff578d 2012-02-24 06:29 PM Chris Cannam

Remove .svn directories from subdirectories in preparation for merging from newer svn repo format

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"

804:548e23d4cd71 2011-11-23 11:15 AM Chris Cannam

Merge from branch "cannam"

792:c2357075c5c9 2011-11-18 05:14 PM Luis Figueira

Merge from 791:dc15818e132e

790:dc15818e132e 2011-11-18 05:12 PM Chris Cannam

Apply same change as in 863f447c4d88 on cannam branch

789:863f447c4d88 2011-11-18 05:11 PM Chris Cannam

Layout changes: move h2 into fieldset top line, etc

787:a36cce722860 2011-11-18 04:53 PM Luis Figueira

Merge from branch "cannam"

742:2034af722d02 2011-11-08 11:33 AM Chris Cannam

Merge from branch "feature_318"

741:496b3cfa2f36 2011-11-07 05:29 PM Chris Cannam

Finish adding download link

524:1248a47e81b3 2011-07-25 02:39 PM Luis Figueira

Merge from branch "luisf"

523:0b6c82dead28 2011-07-25 02:23 PM Luis Figueira

Merge from branch "cannam"

514:7eba09d624db 2011-07-14 10:50 AM Chris Cannam

Merge

511:107d36338b70 2011-07-14 10:43 AM Chris Cannam

Merge from branch "cannam"

510:1afe06d9ba94 2011-07-14 10:42 AM Chris Cannam

Merge from branch "cannam"

508:851510f1b535 2011-07-14 10:37 AM Chris Cannam

Merge from branch "redmine-1.2"

507:0c939c159af4 2011-07-14 10:32 AM Chris Cannam

Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)

504:3cab7f3ad3c7 2011-07-14 10:14 AM Chris Cannam

Merge

503:5d608412b003 2011-07-14 10:14 AM Chris Cannam

Pull out font name specifications from stylesheets and serve differently to different platforms (falling back to our usual web fonts). Fixes #212

502:b9f81065a8e1 2011-07-13 02:37 PM Chris Cannam

Merge from branch "feature_142"

500:d7326bb4f6f0 2011-07-13 02:26 PM Chris Cannam

Show styled member list in Members view for non-manager users; implement member editing partial in this view for manager users. Remove Members tab from Settings

443:350acce374a2 2011-06-06 02:55 PM Chris Cannam

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

442:753f1380d6bc 2011-06-06 02:41 PM Chris Cannam

Merge from branch "redmine-1.2"

441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

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

423:50fd9c6b93a9 2011-05-10 12:00 PM Chris Cannam

Merge from branch "bug_145"

421:3d2f1bea385a 2011-05-10 11:57 AM Chris Cannam

Merge

420:2008fa7fda29 2011-05-10 11:57 AM Chris Cannam

Track the project tree explicitly through recursive functions rather than using lft, rgt ordering. Fixes #145

417:6b3e9f512761 2011-05-10 10:10 AM Chris Cannam

Merge

416:165e443660c4 2011-05-10 10:09 AM Chris Cannam

Merge

415:405dd646a6cc 2011-05-10 10:09 AM Chris Cannam

Merge

414:576a1dca2ee2 2011-05-10 10:08 AM Chris Cannam

Check that user is permitted to see subproject, not only parent project. Fixes #152

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!

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

333:9e5fc43c12a6 2011-03-29 06:06 PM Chris Cannam

Merge

332:e665cc1fdf07 2011-03-29 06:06 PM Chris Cannam

As previous commit, but for project table (rather than "my" project list)

331:4ed4207d81c5 2011-03-29 06:04 PM Chris Cannam

Merge

330:f1a12c3b4587 2011-03-29 06:03 PM Chris Cannam

We don't actually want text formatting in our short summary, but we don't want wiki metacharacters either. So apply wiki formatting and then strip out the tags in a very naive fashion.

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

Merge from branch "live"

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"

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

merge from feature_72

278:c87ed8a009e5 2011-03-21 04:03 PM Chris Cannam

Remove "junk code"

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

Merge from branch "feature_72"

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

TEST DEV commit: creates the repository automatically;

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)

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

Merge from branch "live"

211:122fc5b4547e 2011-02-08 01:55 PM Chris Cannam

Remove unwanted file

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

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

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

Merge from branch "feature_64"

186:011f2ec6018f 2011-02-03 03:34 PM Chris Cannam

Remove unwanted file

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

167:170b8a96b213 2011-02-01 04:42 PM Chris Cannam
  • Merge from cannam-pre-20110113-merge branch
159:4e485928a26b 2011-01-28 11:01 AM Chris Cannam
  • Simplify table construction, with name and description in the same cell and some layout tidying. Eliminates minor bug that made name and description highlight separately on mouseover.
151:e5171a80c541 2011-01-24 02:35 PM Chris Cannam

Un-track file that shouldn't be here

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"

148:e47742d68d2d 2011-01-24 02:03 PM Chris Cannam

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

144:09910262eb0b 2011-01-12 05:06 PM Luis Figueira

Bug #60:
+ the "jump to project" input box is now below the search box
+ the project ancestors are displayed in a separate line

140:4272e09f4b5f 2011-01-20 10:01 AM Chris Cannam

Allow list of managers, if more than one row, to overlap with description
rather than pushing description down

138:fca2657f4aa5 2011-01-20 09:59 AM Chris Cannam

Un-track file that shouldn't be here

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

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