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 / views / welcome @ 1319:5490d6392ee3

# Date Author Comment
1319:5490d6392ee3 2013-06-19 02:44 PM Chris Cannam

Prepare simplification of front page

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

1199:bae194c52296 2013-01-23 11:10 AM Chris Cannam

Merge from branch cannam

1189:3e874cee63af 2013-01-22 03:45 PM Chris Cannam

Layout adjustments to explore boxes

1116:bb32da3bea34 2013-01-07 02:41 PM Chris Cannam

Merge from live

1115:433d4f72a19b 2013-01-07 12:01 PM Chris Cannam

Update to Redmine SVN revision 11137 on 2.2-stable branch

1078:b9e34a051f82 2012-11-21 05:56 PM Chris Cannam

Merge from live branch

1027:b0e0ffb43fa1 2012-11-13 01:25 PM Luis Figueira

Merge

1026:b42553f6df71 2012-11-13 01:23 PM Luis Figueira

Merge

1025:02ee54197879 2012-11-13 12:10 PM Luis Figueira

Merge

1015:52be96e83080 2012-11-12 03:17 PM Chris Cannam

Merge from branch "live"

1012:bbca6f4eebc7 2012-11-12 02:40 PM Chris Cannam

Merge from branch "browsing"

1009:066b55d7c053 2012-11-12 01:34 PM Chris Cannam

Add busy institutions list

1007:3e52bc15dd67 2012-11-09 08:04 PM Chris Cannam

Add browse page stub

1006:4ffe9098c16c 2012-11-09 05:41 PM Chris Cannam

Busy-projects partial, etc

1005:85123e5bc883 2012-11-09 04:33 PM Chris Cannam

Add tag cloud to front page (probably don't want it quite like this in the "real world")

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

935:fe0249c097f6 2012-07-11 01:33 PM Chris Cannam

Merge from the default 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

909:cbb26bc654de 2012-02-24 07:09 PM Chris Cannam

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

908:c6c2cbd0afee 2012-02-24 06:36 PM Chris Cannam

Rename .rhtml files to .html.erb in preparation for merge

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

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

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)

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)

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)

373:c2230be27b7e 2011-04-01 12:21 PM Chris Cannam

Merge from branch "feature_128"

372:bb5e1ca422f8 2011-04-01 12:22 PM Chris Cannam

Merge

371:4188c6eaadf7 2011-04-01 12:22 PM Chris Cannam

Remove Tip of the Day from front page (fixing #128), move News to top of right column

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

Merge from branch "bug_127"

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.

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

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)

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

Update to Redmine trunk rev 4802

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

Merge from branch "live"

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

Merge from live branch

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

120:cd2282d2aa55 2011-01-13 02:33 PM Chris Cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).

119:8661b858af72 2011-01-13 02:12 PM Chris Cannam
  • Update to Redmine trunk rev 4705
118:b859cc0c4fa1 2011-01-13 01:21 PM Chris Cannam

Merge from branch "redmine-1.1"

117:af80e5618e9b 2011-01-13 12:53 PM Chris Cannam
  • Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
113:cede720e8f53 2010-12-20 10:15 PM Chris Cannam
  • Move tip of the day to the right column (now there is more in the left one)
97:5467cbbf393b 2010-12-16 01:43 PM Luis Figueira

Merge from branch "live"

96:98b2834d136b 2010-12-16 01:29 PM Chris Cannam

Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.

95:74cb18079dd6 2010-12-16 01:27 PM Chris Cannam

Separate out Home (link) and Home (heading) texts

51:371eac10df0b 2010-11-24 12:20 PM Chris Cannam
  • Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
50:97333e644a2c 2010-11-23 03:59 PM Chris Cannam

Merge

49:158a59127bbe 2010-11-23 02:57 PM Luis Figueira

The tip of the day only appears to logged in users.

48:8032b626953b 2010-11-23 01:41 PM Luis Figueira

Both the Tip of the Day and the Notifications area only appear if they have content

47:22ae926000f9 2010-11-23 12:47 PM Luis Figueira

Added Notifications Area in Welcome page.
Minor changes to welcome page layout;

45:65d9e2cabaa3 2010-11-23 11:50 AM Luis Figueira

Added tipoftheday to the config/settings in order to correct previous issues.
Tip of the day is now working correctly.
Added the heading strings to the locales files.

43:662737751997 2010-11-22 03:21 PM Luis Figueira

Added "welcome text" style "Tip of the day" feature.

42:df605e25de58 2010-11-22 02:16 PM Luis Figueira

small tests to the welcome page view

41:7f0e922c8982 2010-11-19 02:45 PM Luis Figueira

merged with new version from trunk

38:33d69fee1d99 2010-11-19 01:41 PM Chris Cannam
  • Merge SVN update from default branch
37:94944d00e43c 2010-11-19 01:24 PM Chris Cannam
  • Update to SVN trunk rev 4411
35:67e8aef29de9 2010-11-18 05:50 PM Luis Figueira

simple test

25:9fd6221709a6 2010-09-24 03:51 PM Chris Cannam
  • Merge cannam branch
23:ca82a3468d27 2010-09-24 02:17 PM Chris Cannam
  • Merge SVN update from default
22:40f7cfd4df19 2010-09-24 02:06 PM Chris Cannam
  • Update to SVN trunk rev 4173
15:9c6c72729d91 2010-08-25 04:33 PM Chris Cannam
  • Merge from default (for SVN trunk update)
14:1d32c0a0efbf 2010-08-25 04:30 PM Chris Cannam
  • Update to SVN trunk (revisions 3892-4040)
1:cca12e1c1fd4 2010-07-28 12:08 PM Chris Cannam
  • Update to Redmine trunk (SVN revisions 3860-3892)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859