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 @ 906:154205fd9f8b

# Date Author Comment
906:154205fd9f8b 2012-02-02 05:06 PM Luis Figueira

Merge from branch "cannam"

902:8623d131c9ad 2012-02-02 03:26 PM Chris Cannam

Merge from branch "cannam"

898:84f0b221aa7a 2012-02-02 03:02 PM Chris Cannam

Merge

897:b293eb7e5c94 2012-02-02 03:02 PM Chris Cannam

Use revision string instead of changeset object for archive link (works for branch and tag as well as changeset)

838:1b3e19345cf5 2012-02-01 11:16 AM Luis Figueira

Merge from branch "cannam"

834:6f5c0ac92d72 2012-02-01 10:48 AM Chris Cannam

Merge from branch "cannam"

833:793a52eb8d32 2012-02-01 10:35 AM Chris Cannam

Merge from branch "bug_352"

832:cbd0b4560105 2012-01-31 04:09 PM Luis Figueira

Merge from branch "bug_352"

831:7614169e14ed 2012-01-31 04:09 PM Luis Figueira

fixes bug #352. This fix needs to be reviewd, because it changes directly the redmine core.

830:f87006561e09 2012-01-31 01:46 PM Chris Cannam

Merge

829:7a613c0eefe2 2012-01-31 01:45 PM Chris Cannam

Hide tracker options in the new-project version of the project settings form

828:f31a4cea8c05 2012-01-31 01:41 PM Chris Cannam

Merge

827:bbe339e5eba1 2012-01-31 01:40 PM Chris Cannam

Clarify some new-project descriptive texts

825:48af1a50d2c8 2012-01-31 12:48 PM Chris Cannam

Merge

824:c62a0b66bd38 2012-01-31 12:47 PM Chris Cannam

Add New Project link to My page, fixing #361

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"

811:b4e59a60b447 2011-11-23 01:58 PM Chris Cannam

Merge from branch "cannam"

810:aaa26ccafb00 2011-11-23 01:57 PM Chris Cannam

Move tags list on project show page

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"

780:31b3aa308568 2011-11-18 11:09 AM Chris Cannam

Merge from branch "feature_14"

774:58410c63bb84 2011-11-17 02:56 PM Chris Cannam

Force a Google search box rudely into the middle of the search view, just to see how it looks.
It can be styled reasonably well -- but the adverts, when they appear, are atrocious.

767:dd33798e514d 2011-11-15 03:03 PM Luis Figueira

Reverts changes made to Redmine Core's Projects Controller in b2a9e64b8283. Pagination now being done for both normal and filtered projects index.

765:7fd52a786954 2011-11-15 10:36 AM Chris Cannam

Merge

762:7dc4d205233e 2011-11-15 10:34 AM Chris Cannam

Merge from branch "feature_14"

760:b2a9e64b8283 2011-11-11 06:32 PM Luis Figueira

Fixes Bug #322, but is not self-contained in the plugin (basically I'm editing the original projects controller…)

744:0c23dd3d0b71 2011-11-08 02:20 PM Chris Cannam

Merge from branch "bug_320"

743:7ded87cc4b80 2011-11-08 02:19 PM Chris Cannam

Bug #320: Offer login page instead of 404 for nonexistent project when user not logged in -- hiding the difference between existing private project and nonexistent one

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

740:8873bc7c1af5 2011-11-04 05:56 PM Chris Cannam

Hack in simplistic download link

723:d41bf754c0f2 2011-10-20 04:36 PM Luis Figueira

Merge from branch "live"

717:fce7374e48b7 2011-10-04 10:55 AM Chris Cannam

Remove language field; we only handle English

695:1710ec37bb6a 2011-09-16 06:40 PM Luis Figueira

Merge from branch "feature_36"

689:a8e402f48723 2011-09-16 03:51 PM Chris Cannam

Merge from branch "live"

688:1f488f375d64 2011-09-16 03:49 PM Chris Cannam

Merge from branch "live"

681:6bbcfcb85e50 2011-09-15 03:36 PM Chris Cannam

Transplant rev 65abc6b39292 from live branch

680:65abc6b39292 2011-09-14 02:26 PM Chris Cannam

Transfer custom welcome-page code from mainline to bibliography plugin code.
This is far too awkward. We need a better way.

665:45ec06a8eec9 2011-09-09 04:42 PM Chris Cannam

Merge from branch "cannam_integration"

663:3c49c63173ef 2011-09-09 04:35 PM Chris Cannam

Merge from branch "cannam"

662:cd9499a11381 2011-09-09 04:34 PM Chris Cannam

Merge from branch "cannam"

648:7fc15203288c 2011-09-09 01:20 PM Chris Cannam

Minor layout fix for user show page

641:b4e9410882f1 2011-09-06 12:24 PM Chris Cannam

Merge from branch "cannam"

637:efdb97a8286c 2011-09-06 12:07 PM Chris Cannam

Restore Tip of the Day settings entry lost during merge of rev cd2282d2aa55

636:12701b2e1bfc 2011-09-06 11:31 AM Chris Cannam

Change "View all issues" to "View all watched issues" for watched issues box in My Page

634:eaec823e6e23 2011-09-06 09:47 AM Chris Cannam

Merge from branch "cannam"

599:251b380117ce 2011-08-16 05:01 PM Chris Cannam

Introduce a new latest_downloads plugin to manage active and shortcut for attachments.
Add a table for attachment active/shortcut data.
Move existing active-handler code into the new plugin (but still using the "old" active column in the attachments table). Note the files_controller stuff doesn't actually work here.

590:3ebf9b76e57f 2011-08-12 02:52 PM Chris Cannam

Merge from bug_213

589:b8549c67f9a7 2011-08-12 02:51 PM Chris Cannam

Fix #213

588:91389d8bbdea 2011-08-12 02:40 PM Chris Cannam

Merge from bug_255

587:edce3dafd217 2011-08-12 02:40 PM Chris Cannam

Some text changes to fix #255

548:3954b253cdb3 2011-07-29 07:28 PM Luis Figueira

Merge from branch "feature_36"

528:7c7199e1f174 2011-07-25 03:00 PM Chris Cannam

Merge from branch "feature_36"

526:930258005822 2011-07-25 02:53 PM Luis Figueira

Merge from branch "luisf"

525:8a26a0e291cf 2011-07-25 02:53 PM Luis Figueira

Added method to retrieve a user's institution name to the ssamr_user_detail Model.

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

499:85fd403a7daa 2011-07-13 12:46 PM Chris Cannam

Merge

498:87bfac1079fd 2011-07-13 12:45 PM Chris Cannam

If a search matches any project titles (and projects are in scope for the search), show those projects separately at the start of the search results provided there are no more than 5 of them (further fix to bug #94)

497:f6ed606887bc 2011-07-13 11:59 AM Chris Cannam

Merge

496:eef2e2ed53c9 2011-07-13 11:59 AM Chris Cannam

Fix NoMethodError on right-click -> Edit on issue in issues list (fixes #162)

495:970f46489d29 2011-07-13 11:08 AM Chris Cannam

Merge

494:4bc63ccdb6ed 2011-07-13 11:08 AM Chris Cannam

Remove member lists from custom welcome page (bug #208)

493:7a2bb9c5fb34 2011-07-13 11:03 AM Chris Cannam

Some experiments toward adding a Members entry to the project menu (for feature #142)

491:57c28ea4c482 2011-07-12 11:53 AM Chris Cannam

Merge

490:cd64fb9ab701 2011-07-12 11:51 AM Chris Cannam

Add "Edit this page" link to welcome page if the current user is authorised to do so

489:1c1ee0b2a107 2011-07-11 04:50 PM Chris Cannam

Merge

488:0b44fc2cdd00 2011-07-11 04:50 PM Chris Cannam

Include link to our site and contact link in page footer

486:4c0d58c5d1e0 2011-07-11 04:42 PM Chris Cannam

Merge

485:ef125e1f3a10 2011-07-11 04:42 PM Chris Cannam

Remove Calendar from default blocks in My Page

476:9867ed78c4c1 2011-06-27 12:38 PM Chris Cannam

Merge

475:32dd9e02950a 2011-06-27 12:38 PM Chris Cannam

Merge

474:dff13616e464 2011-06-27 12:37 PM Chris Cannam

Avoid double-slash in path

473:ec7c78040115 2011-06-27 12:28 PM Chris Cannam

Merge from branch "feature_36" into a specially created integration branch

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)

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

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

Merge from branch "bug_145"

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

Merge from branch bug_133

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

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)

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

Merge