| Thu, 24 Nov 2011 12:48:19 +0000 |
Chris Cannam |
Close obsolete branch feature_14
feature_14
|
| Wed, 01 Feb 2012 12:47:54 +0000 |
Chris Cannam |
Close obsolete branch feature_361
feature_361
|
| Wed, 01 Feb 2012 13:40:49 +0000 |
Chris Cannam |
Close obsolete branch bug_362
bug_362
|
| Wed, 01 Feb 2012 13:45:56 +0000 |
Chris Cannam |
Close obsolete branch feature_364
feature_364
|
| Wed, 01 Feb 2012 16:09:00 +0000 |
Chris Cannam |
Close obsolete branch bug_352
bug_352
|
| Thu, 02 Feb 2012 11:45:54 +0000 |
Chris Cannam |
Close obsolete branch bug_366
bug_366
|
| Fri, 03 Feb 2012 14:03:51 +0000 |
Chris Cannam |
Close obsolete branch bug_365
bug_365
|
| Fri, 03 Feb 2012 15:02:13 +0000 |
Chris Cannam |
Close obsolete branch bug_371
bug_371
|
| Fri, 03 Feb 2012 15:20:50 +0000 |
Chris Cannam |
Close obsolete branch bug_367
bug_367
|
| Fri, 03 Aug 2012 19:40:23 +0100 |
Chris Cannam |
Close obsolete branch bug_505
bug_505
|
| Wed, 17 Oct 2012 16:48:02 +0100 |
Chris Cannam |
Close obsolete branch feature_523
feature_523
|
| Thu, 18 Oct 2012 10:42:48 +0100 |
Chris Cannam |
Close obsolete branch bug_521
bug_521
|
| Mon, 21 Jan 2013 15:48:48 +0000 |
Chris Cannam |
Remove nil projects before sorting
cannam
|
| Mon, 21 Jan 2013 14:18:00 +0000 |
Chris Cannam |
Merge from live branch
cannam
|
| Mon, 21 Jan 2013 14:17:46 +0000 |
Chris Cannam |
Merge from branch "issue_540"
cannam
|
| Mon, 21 Jan 2013 14:17:29 +0000 |
Chris Cannam |
Merge from branch "feature_550"
cannam
|
| Mon, 21 Jan 2013 14:12:05 +0000 |
Chris Cannam |
Make "my projects" box on My Page look nice when user has no projects (invite them to create one)
feature_550
|
| Wed, 16 Jan 2013 16:59:49 +0000 |
luisf |
Changing Rails version to 3.2.11 (current).
redmine-2.2-integration
|
| Wed, 16 Jan 2013 16:18:43 +0000 |
luisf |
Backed out changeset 614a655f724b
redmine-2.2-integration
|
| Wed, 16 Jan 2013 12:14:38 +0000 |
luisf |
Gem Citeproc changed name.
redmine-2.2-integration
|
| Tue, 15 Jan 2013 18:46:39 +0000 |
luisf |
Backed out changeset b619a667a8e8
redmine-2.2-integration
|
| Tue, 15 Jan 2013 17:25:49 +0000 |
luisf |
fixes parameters for bibtex class to_citeproc call.
redmine-2.2-integration
|
| Tue, 15 Jan 2013 16:08:00 +0000 |
Chris Cannam |
Fix Javascript so as to update star properly
redmine-2.2-integration
|
| Tue, 15 Jan 2013 15:55:45 +0000 |
Chris Cannam |
A couple of further html_safes
redmine-2.2-integration
|
| Tue, 15 Jan 2013 15:51:29 +0000 |
Chris Cannam |
Minor adjustments
redmine-2.2-integration
|
| Tue, 15 Jan 2013 15:48:21 +0000 |
Chris Cannam |
Provide a JS callback which should (?) be rendered by toggle_active ajax call
redmine-2.2-integration
|
| Tue, 15 Jan 2013 15:45:22 +0000 |
Chris Cannam |
Fix remote syntax for Rails 3 (doesn't work though); html safe in label
redmine-2.2-integration
|
| Tue, 15 Jan 2013 15:39:59 +0000 |
Chris Cannam |
Map the toggle_active for attachments
redmine-2.2-integration
|
| Tue, 15 Jan 2013 12:35:27 +0000 |
Chris Cannam |
Fix to prior commit
redmine-2.2-integration
|
| Tue, 15 Jan 2013 12:26:20 +0000 |
Chris Cannam |
html output in parent project link
redmine-2.2-integration
|
| Tue, 15 Jan 2013 10:41:33 +0000 |
luisf |
Applying HTML safe method to filtered projects output.
redmine-2.2-integration
|
| Mon, 14 Jan 2013 17:45:54 +0000 |
luisf |
Fixes broken route in projects index.
redmine-2.2-integration
|
| Mon, 14 Jan 2013 15:14:37 +0000 |
luisf |
Tags plugin: removed TabularFormBuilder (no longer used by Redmine).
redmine-2.2-integration
|
| Mon, 14 Jan 2013 15:10:28 +0000 |
luisf |
Tags Plugin: changed form_remote_tag to form_tag with :remote hash.
redmine-2.2-integration
|
| Mon, 14 Jan 2013 14:18:03 +0000 |
luisf |
Removes unneeded/buggy query.
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:36:32 +0000 |
Chris Cannam |
Don't want the my-project star
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:33:35 +0000 |
Chris Cannam |
Adjust header height
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:30:13 +0000 |
Chris Cannam |
Fix rendering of project homepages with custom welcome pages
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:25:28 +0000 |
Chris Cannam |
Syntax fixes
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:23:50 +0000 |
Chris Cannam |
Restore members route (in addition to memberships) to avoid changing URLs
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:23:35 +0000 |
Chris Cannam |
Restore rendering of members list
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:11:59 +0000 |
Chris Cannam |
Ensure generated HTML is marked as safe & thus rendered
redmine-2.2-integration
|
| Thu, 10 Jan 2013 15:11:44 +0000 |
Chris Cannam |
Restore missing open-div
redmine-2.2-integration
|
| Thu, 10 Jan 2013 11:11:15 +0000 |
Chris Cannam |
We don't use ZeroClipboard, just scrub this stuff (image_path with 2 args doesn't appear to work any more)
redmine-2.2-integration
|
| Thu, 10 Jan 2013 11:01:47 +0000 |
Chris Cannam |
Fix "uninitialized constant Redmine::Scm::Adapters::CommandFailed" (see https://www.chiliproject.org/projects/chiliproject/repository/revisions/cbcce704006c6827b4a3134a2dda9de7c47f18ae)
redmine-2.2-integration
|
| Thu, 10 Jan 2013 11:01:05 +0000 |
Chris Cannam |
Fix Ruby syntax
redmine-2.2-integration
|
| Wed, 09 Jan 2013 17:40:37 +0000 |
Chris Cannam |
Update for security fix
live
|
| Wed, 09 Jan 2013 12:45:01 +0000 |
luisf |
Bibliography Plugin - added gemfile with gem prerequisites (todo: need to specify individual gem versions).
redmine-2.2-integration
|
| Wed, 09 Jan 2013 12:41:39 +0000 |
luisf |
RedmineTags plugin: merged exiting with the most up-to-date version from the repo.
redmine-2.2-integration
|
| Wed, 09 Jan 2013 11:53:24 +0000 |
luisf |
Fixed RedmineTags routes file (new Rails version standard).
redmine-2.2-integration
|
| Wed, 09 Jan 2013 11:48:44 +0000 |
luisf |
Fixed RedmineBibliography's routes file to ensure compatibility with Rails >3.1.
redmine-2.2-integration
|
| Wed, 09 Jan 2013 11:45:25 +0000 |
luisf |
Changed projects#explore to ensure compatibility with Rails 3.
redmine-2.2-integration
|
| Wed, 09 Jan 2013 11:25:55 +0000 |
luisf |
Removed line from the Projects Controller that was mistakenly left after the merge from the pristine branch.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:58:46 +0000 |
luisf |
Fixes dependency declaration for patches in the bibliography plugin init file.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:33:27 +0000 |
luisf |
Changed file coding header from undefined to utf-8 (was raising an error).
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:24:42 +0000 |
luisf |
Fixed if/else statement syntax error.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:22:05 +0000 |
luisf |
Added debug/todo comments to previous commits changes.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:19:01 +0000 |
luisf |
Rails 3 compatibility: renamed all named_scope calls to scope.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:11:18 +0000 |
luisf |
Fixed Dispatcher call to provide compatibility with current version of Redmine.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:08:55 +0000 |
luisf |
Fixed Routes and Dispatcher calls in order to be compatible current version of Rails.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 16:04:52 +0000 |
luisf |
fixed a syntax error on an if/else statement.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 14:43:04 +0000 |
luisf |
Deleted existing the embedded plugin and replaced it witgh redmine_embedded (same functionality, but upgraded to be compatible with Redmine 2.x).
redmine-2.2-integration
|
| Tue, 08 Jan 2013 14:06:55 +0000 |
luisf |
Fixed dispatcher and routes issues due to upgrading to the new rails/redmine versions.
redmine-2.2-integration
|
| Tue, 08 Jan 2013 12:32:05 +0000 |
luisf |
Moved all the plugins from the vendor folder to the application root folder.
redmine-2.2-integration
|
| Mon, 07 Jan 2013 14:41:20 +0000 |
Chris Cannam |
Merge from live
redmine-2.2-integration
|
| Mon, 07 Jan 2013 12:01:42 +0000 |
Chris Cannam |
Update to Redmine SVN revision 11137 on 2.2-stable branch
redmine-2.2
|
| Fri, 14 Dec 2012 19:50:00 +0000 |
luisf |
development commit - changing association validations. not working correctly
bibplugin_bibtex
|
| Tue, 11 Dec 2012 18:48:33 +0000 |
luisf |
creates the author in case it no suggestion was made by the user.
bibplugin_bibtex
|
| Tue, 11 Dec 2012 16:49:41 +0000 |
luisf |
Adds attribute accessors to the bibtex_entry model in order to silently ignore unknown parameters; fixes association between authors/users/authorships.
bibplugin_bibtex
|
| Fri, 07 Dec 2012 14:39:38 +0000 |
luisf |
adds all the necessary hidden fieds; associates authors, users and publications. Known issues associating publications, authors and users.
bibplugin_bibtex
|
| Thu, 06 Dec 2012 21:45:34 +0000 |
luisf |
adds the parsed publication fields to hidden fields in the form (incomplete)
bibplugin_bibtex
|
| Thu, 06 Dec 2012 18:09:40 +0000 |
luisf |
No longer saving the temporary model - filling out the publication/bibtex fields instead.
bibplugin_bibtex
|
| Thu, 06 Dec 2012 16:37:47 +0000 |
luisf |
Removed unused files.
bibplugin_bibtex
|
| Thu, 06 Dec 2012 10:20:42 +0000 |
Chris Cannam |
Reduce amount of log output
live
|
| Wed, 05 Dec 2012 19:13:15 +0000 |
luisf |
Saves the temporary publication object, as well as it's id on the form.
bibplugin_bibtex
|
| Wed, 05 Dec 2012 16:52:43 +0000 |
luisf |
Dev commit - fails when saving the temporary publication (no authors).
bibplugin_bibtex
|
| Tue, 04 Dec 2012 18:15:17 +0000 |
luisf |
small changes to bibtex parsing.
bibplugin_bibtex
|
| Mon, 03 Dec 2012 17:53:15 +0000 |
luisf |
(dev commit) added a submit button; correctly posts the form's data. Started working on the create from bibtex action.
bibplugin_bibtex
|
| Mon, 03 Dec 2012 12:55:16 +0000 |
luisf |
Creates independent sets of radio buttons for each author.
bibplugin_bibtex
|
| Fri, 30 Nov 2012 17:39:34 +0000 |
luisf |
creates radio buttons for the suggested authors/users.
bibplugin_bibtex
|
| Thu, 29 Nov 2012 17:32:54 +0000 |
luisf |
prints number of found authors and users. New data structure for users and authors.
bibplugin_bibtex
|
| Thu, 29 Nov 2012 14:42:16 +0000 |
luisf |
Merge
bibplugin_bibtex
|
| Thu, 29 Nov 2012 14:41:31 +0000 |
luisf |
Merge
bibplugin_integration
|
| Thu, 29 Nov 2012 14:40:50 +0000 |
luisf |
Created migration to add timestamps to the authorships table.
bibplugin_db_migrations
|
| Thu, 29 Nov 2012 14:38:12 +0000 |
luisf |
Merge
bibplugin_db_migrations
|
| Thu, 29 Nov 2012 14:29:31 +0000 |
luisf |
Fixes small bug that prevented the email domain from being created in the autocomplete_for_authors action.
bibplugin_bibtex
|
| Wed, 28 Nov 2012 19:32:31 +0000 |
luisf |
cleaned some code, fixes a couple of issues.
bibplugin_bibtex
|
| Tue, 27 Nov 2012 17:39:01 +0000 |
luisf |
minor changes on structure of suggestions; deleted some unused code
bibplugin_bibtex
|
| Mon, 26 Nov 2012 17:41:48 +0000 |
luisf |
design changes in the new publication forms
bibplugin_bibtex
|
| Mon, 26 Nov 2012 17:39:51 +0000 |
luisf |
Merge
bibplugin_bibtex
|
| Mon, 26 Nov 2012 17:36:31 +0000 |
luisf |
Merge
bibplugin_bibtex
|
| Mon, 26 Nov 2012 15:48:19 +0000 |
luisf |
Merge
bibplugin_integration
|
| Fri, 23 Nov 2012 17:53:51 +0000 |
luisf |
Overrides activities controller _recent.html.erb view (so that it displays a publication in the my page).
issue_540
|
| Fri, 23 Nov 2012 17:25:27 +0000 |
luisf |
* (publication.rb) - fixed the acts_as_activity query (see diff to previous commit) - not returning duplicate results any longer; added the visible scope to the publication model;
issue_540
|
| Fri, 23 Nov 2012 14:29:55 +0000 |
Chris Cannam |
Add "My Page" box for my projects. Currently this also affects the layout of the non-My-Page version of the My Projects list, need to adjust that
feature_550
|
| Fri, 23 Nov 2012 13:34:37 +0000 |
Chris Cannam |
Merge from branch "cannam"
live
|
| Fri, 23 Nov 2012 13:34:20 +0000 |
Chris Cannam |
Merge from branch "bug_531"
cannam
|
| Thu, 22 Nov 2012 18:10:33 +0000 |
Chris Cannam |
If the file is large, acknowledge that it might be too large rather than binary (could be a big text file)
bug_531
|
| Thu, 22 Nov 2012 18:04:17 +0000 |
Chris Cannam |
In repo controller entry action, show the page for the file even if it's binary (so user still has access to history etc links). This makes it possible to use the entry action as the default when a file is clicked on
bug_531
|
| Thu, 22 Nov 2012 17:26:15 +0000 |
Chris Cannam |
Merge from branch cannam
bug_531
|
| Thu, 22 Nov 2012 16:51:23 +0000 |
luisf |
Makes the Publication model act as an activity; overloading the default ActivitiesController#index view in the Bibliography Plugin in order to differentiate Publications from the other event types.
issue_540
|
| Wed, 21 Nov 2012 18:16:32 +0000 |
luisf |
Merge
luisf
|
| Wed, 21 Nov 2012 17:56:50 +0000 |
Chris Cannam |
Merge from live branch
|
| Wed, 21 Nov 2012 17:47:51 +0000 |
Chris Cannam |
Merge from branch "cannam"
live
|
| Wed, 21 Nov 2012 17:38:01 +0000 |
Chris Cannam |
Enable file store cache for everything
cannam
|
| Wed, 21 Nov 2012 17:35:50 +0000 |
Chris Cannam |
Merge from branch "luisf"
cannam
|
| Wed, 21 Nov 2012 16:04:55 +0000 |
luisf |
Merge
luisf
|
| Wed, 21 Nov 2012 15:58:12 +0000 |
luisf |
Reverted the redminte_tags patches to the previous versions; cleaned unused code.
bibplugin_integration
|
| Wed, 21 Nov 2012 15:12:31 +0000 |
luisf |
Merge
bibplugin_integration
|
| Wed, 21 Nov 2012 15:09:58 +0000 |
luisf |
Deletes publication cache on controller update action.
bibplugin_cache
|
| Wed, 21 Nov 2012 14:42:12 +0000 |
luisf |
Created a patch for the ProjectsHelper to replace the one previously created for the Projects controller.
bibplugin_cache
|
| Wed, 21 Nov 2012 11:24:42 +0000 |
luisf |
added projects_controller_patch (includes the publications helper to the projects controller) - forgot to add this file to version control in the last commit.
bibplugin_cache
|
| Tue, 20 Nov 2012 16:55:41 +0000 |
luisf |
Added local caching to the publications helper; patch to the projects controller to load the publications helper; added patch to the plugin init file
bibplugin_cache
|
| Tue, 20 Nov 2012 16:55:13 +0000 |
luisf |
moved the tags helper patch from the projects helper patch to the projects controller patch
bibplugin_cache
|
| Tue, 20 Nov 2012 10:36:40 +0000 |
luisf |
Merge from branch "luisf"
bibplugin_integration
|
| Tue, 20 Nov 2012 10:36:09 +0000 |
luisf |
Merge
luisf
|
| Tue, 20 Nov 2012 10:33:11 +0000 |
luisf |
Addresses bug #546 - uneeded project.id parameter being sent to the project_tags action of the auto_completes controller
issue_546
|
| Mon, 19 Nov 2012 19:57:05 +0000 |
luisf |
Merge
bibplugin_integration
|
| Mon, 19 Nov 2012 19:55:54 +0000 |
luisf |
Merge
luisf
|
| Mon, 19 Nov 2012 19:50:04 +0000 |
luisf |
Merge from live site's latest changes.
luisf
|
