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 / db @ 912:5e80956cc792

# Date Author Comment
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)
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)
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"
353:dde1d4de8b32 2011-03-31 08:25 PM Chris Cannam

Add forgotten migration
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"
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
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"
253:82caabe96ad4 2011-03-03 03:30 PM Chris Cannam
  • Add "active" column to attachments table (file downloads) in db
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"
230:cc406607458c 2011-02-17 04:46 PM Chris Cannam

Remove two unwanted files erroneously introduced in previous merge. These have previously been removed in bb7cac2ac146, but on a different branch
229:344f68e4b103 2011-02-17 04:43 PM Chris Cannam

Merge from branch "luisf". This merges the label change from Files to Downloads
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
208:bb7cac2ac146 2011-02-08 01:15 PM Luis Figueira

removed 2 files that should not be here (related to previous experiences with T&C)
202:11661511fc20 2011-02-07 04:22 PM Luis Figueira

migration to add external repositories columns to repositories table.
195:172b8d25c1ae 2011-02-07 01:47 PM Chris Cannam

Merge from branch "feature_64"
193:90cc857e968a 2011-02-07 12:52 PM Luis Figueira

Merge from branch "feature_64"
184:b46db3a8b1b4 2011-02-03 03:15 PM Chris Cannam

Merge from branch "feature_55"
182:5b074cadc4d1 2011-02-03 02:42 PM Luis Figueira

Institution order number explicit in seed data file and now correctly processed.
179:da7cba64948d 2011-02-02 06:17 PM Luis Figueira

new column in institutions table: order
new seed data function
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
157:2d5da64204bc 2011-01-26 03:58 PM Luis Figueira

migration with new "other_institution" column in ssamr_user_details table.
143:0460c75392bc 2011-01-21 02:31 PM Luis Figueira

development commit: terms and conditions
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)
106:f6ea6ffaaeeb 2010-12-17 10:28 AM Luis Figueira

Migration that renames the column in ssamr table (university->institution_id)
98:596803cb34fc 2010-12-16 02:55 PM Luis Figueira

Created a model for the Intitutions;
Created a seed file to initialize the db;
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.
84:432bb11e0390 2010-12-16 10:03 AM Chris Cannam

Merge from branch "luisf"
56:1d072f771b4d 2010-11-26 03:46 PM Luis Figueira

changes to add SSAMR info. This is a development Commit - DO NOT USE this version.
54:cbaf7863aafb 2010-11-24 11:08 AM Luis Figueira

DB Migrate that adds ssamr_description column to users table.
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.
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
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