| Mon, 25 Jul 2011 14:23:37 +0100 |
luisf |
Merge from branch "cannam"
luisf
|
| Mon, 25 Jul 2011 13:17:08 +0100 |
Chris Cannam |
Merge from branch "feature_36"
cannam_integration
|
| Mon, 25 Jul 2011 13:16:57 +0100 |
Chris Cannam |
Merge from branch "cannam"
cannam_integration
|
| Thu, 14 Jul 2011 12:09:14 +0100 |
Chris Cannam |
Merge from branch "live"
cannam
|
| Fri, 15 Jul 2011 17:21:05 +0100 |
luisf |
Correctly searches and sends the parameters for both users and authors.
feature_36
|
| Thu, 14 Jul 2011 17:10:24 +0100 |
luisf |
virtual attribute to handle users; javascript handling users correctly
feature_36
|
| Thu, 14 Jul 2011 12:07:42 +0100 |
Chris Cannam |
More debug info
live
|
| Thu, 14 Jul 2011 12:07:17 +0100 |
Chris Cannam |
Salted is now the default everywhere
live
|
| Thu, 14 Jul 2011 10:51:30 +0100 |
Chris Cannam |
Merge from branch "live"
cannam
|
| Thu, 14 Jul 2011 10:50:53 +0100 |
Chris Cannam |
Merge
live
|
| Thu, 14 Jul 2011 10:44:50 +0100 |
Chris Cannam |
Merge from branch "live"
cannam
|
| Thu, 14 Jul 2011 10:46:20 +0100 |
Chris Cannam |
Remove unwanted files
live
|
| Thu, 14 Jul 2011 10:43:07 +0100 |
Chris Cannam |
Merge from branch "cannam"
live
|
| Thu, 14 Jul 2011 10:42:41 +0100 |
Chris Cannam |
Merge from branch "cannam"
cannam_integration
|
| Thu, 14 Jul 2011 10:40:18 +0100 |
Chris Cannam |
OK, it appears that we do need en-GB.yml to exist -- but it can be empty
cannam
|
| Thu, 14 Jul 2011 10:37:36 +0100 |
Chris Cannam |
Merge from branch "redmine-1.2"
cannam
|
| Thu, 14 Jul 2011 10:32:19 +0100 |
Chris Cannam |
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
redmine-1.2
|
| Thu, 14 Jul 2011 10:21:43 +0100 |
Chris Cannam |
Remove en-GB.yml. Since feature #117, we have been using only en.yml and en-GB should not exist in the directory tree.
cannam
|
| Thu, 14 Jul 2011 10:21:09 +0100 |
Chris Cannam |
Add two translation strings that were only in en-GB previously
cannam
|
| Thu, 14 Jul 2011 10:14:12 +0100 |
Chris Cannam |
Merge
cannam
|
| Thu, 14 Jul 2011 10:14:03 +0100 |
Chris Cannam |
Pull out font name specifications from stylesheets and serve differently to different platforms (falling back to our usual web fonts). Fixes #212
feature_212
|
| Wed, 13 Jul 2011 14:37:14 +0100 |
Chris Cannam |
Merge from branch "feature_142"
cannam
|
| Wed, 13 Jul 2011 14:37:04 +0100 |
Chris Cannam |
Update ignore file
cannam
|
| Wed, 13 Jul 2011 14:26:44 +0100 |
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
feature_142
|
| Wed, 13 Jul 2011 12:46:00 +0100 |
Chris Cannam |
Merge
cannam
|
| Wed, 13 Jul 2011 12:45:24 +0100 |
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)
bug_94
|
| Wed, 13 Jul 2011 11:59:48 +0100 |
Chris Cannam |
Merge
cannam
|
| Wed, 13 Jul 2011 11:59:19 +0100 |
Chris Cannam |
Fix NoMethodError on right-click -> Edit on issue in issues list (fixes #162)
bug_162
|
| Wed, 13 Jul 2011 11:08:16 +0100 |
Chris Cannam |
Merge
cannam
|
| Wed, 13 Jul 2011 11:08:06 +0100 |
Chris Cannam |
Remove member lists from custom welcome page (bug #208)
bug_208
|
| Wed, 13 Jul 2011 11:03:57 +0100 |
Chris Cannam |
Some experiments toward adding a Members entry to the project menu (for feature #142)
feature_142
|
| Tue, 12 Jul 2011 16:57:51 +0100 |
Chris Cannam |
Clear out some unused font definitions
cannam
|
| Tue, 12 Jul 2011 11:53:37 +0100 |
Chris Cannam |
Merge
cannam
|
| Tue, 12 Jul 2011 11:51:42 +0100 |
Chris Cannam |
Add "Edit this page" link to welcome page if the current user is authorised to do so
feature_199
|
| Mon, 11 Jul 2011 16:50:45 +0100 |
Chris Cannam |
Merge
cannam
|
| Mon, 11 Jul 2011 16:50:18 +0100 |
Chris Cannam |
Include link to our site and contact link in page footer
feature_188
|
| Mon, 11 Jul 2011 16:44:23 +0100 |
Chris Cannam |
Remove temporary files
cannam
|
| Mon, 11 Jul 2011 16:42:20 +0100 |
Chris Cannam |
Merge
cannam
|
| Mon, 11 Jul 2011 16:42:08 +0100 |
Chris Cannam |
Remove Calendar from default blocks in My Page
bug_189
|
| Mon, 11 Jul 2011 16:35:45 +0100 |
Chris Cannam |
Merge from branch "feature_36"
cannam_integration
|
| Thu, 07 Jul 2011 18:20:31 +0100 |
luisf |
removed unnecessary rjs file; extending the User Model to handle Users with no Author.
feature_36
|
| Tue, 05 Jul 2011 17:00:30 +0100 |
luisf |
correctly adds multiple authors; correctly sets user_id in the form
feature_36
|
| Mon, 04 Jul 2011 18:56:45 +0100 |
luisf |
created author search virtual attribute in authorship model.
feature_36
|
| Thu, 30 Jun 2011 18:19:52 +0100 |
luisf |
new controller logic.
feature_36
|
| Thu, 30 Jun 2011 12:54:10 +0100 |
luisf |
correctly saving ONE authorship model when creating new publication.
feature_36
|
| Wed, 29 Jun 2011 17:12:03 +0100 |
luisf |
corrrectly searches for the user. some issues pending saving the author model.
feature_36
|
| Tue, 28 Jun 2011 17:42:49 +0100 |
luisf |
Several changes in the author forms.
feature_36
|
| Mon, 27 Jun 2011 12:38:09 +0100 |
Chris Cannam |
Merge
cannam_integration
|
| Mon, 27 Jun 2011 12:38:02 +0100 |
Chris Cannam |
Merge
cannam
|
| Mon, 27 Jun 2011 12:37:09 +0100 |
Chris Cannam |
Avoid double-slash in path
feature_125
|
| Mon, 27 Jun 2011 12:28:32 +0100 |
Chris Cannam |
Merge from branch "feature_36" into a specially created integration branch
cannam_integration
|
| Fri, 24 Jun 2011 17:13:29 +0100 |
luisf |
Add Me as Author: started building the AJAX call to fill the form.
feature_36
|
| Fri, 24 Jun 2011 15:11:30 +0100 |
luisf |
Using Authorships instead of Authors in the new/show actions of the publication controller.
feature_36
|
| Fri, 24 Jun 2011 11:41:01 +0100 |
luisf |
Correctly removing authors.
feature_36
|
| Fri, 24 Jun 2011 11:23:23 +0100 |
luisf |
correctly saving authors.
feature_36
|
| Thu, 23 Jun 2011 18:52:30 +0100 |
luisf |
dynamically adding/removing users.
feature_36
|
| Wed, 22 Jun 2011 19:42:31 +0100 |
luisf |
addin/removing authors - not finished
feature_36
|
| Wed, 22 Jun 2011 13:10:59 +0100 |
luisf |
Created the one-to-one relationship between bibliography authors and users.
feature_36
|
| Tue, 21 Jun 2011 18:11:41 +0100 |
luisf |
Created the publications box in the project's main page
feature_36
|
| Tue, 21 Jun 2011 17:13:08 +0100 |
luisf |
correctly adding more than one project to a publication.
feature_36
|
