| Wed, 30 Mar 2011 11:05:36 +0100 |
Chris Cannam |
Merge
live
|
| Wed, 30 Mar 2011 11:05:16 +0100 |
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
cannam-pre-20110113-merge
|
| Wed, 30 Mar 2011 00:55:57 +0100 |
luisf |
small changes to the controllers/views.
feature_36
|
| Tue, 29 Mar 2011 18:06:56 +0100 |
Chris Cannam |
Merge
live
|
| Tue, 29 Mar 2011 18:06:44 +0100 |
Chris Cannam |
As previous commit, but for project table (rather than "my" project list)
cannam-pre-20110113-merge
|
| Tue, 29 Mar 2011 18:04:17 +0100 |
Chris Cannam |
Merge
live
|
| Tue, 29 Mar 2011 18:03:55 +0100 |
Chris Cannam |
We don't actually want text formatting in our short summary, but we don't want wiki metacharacters either. So apply wiki formatting and then strip out the tags in a very naive fashion.
cannam-pre-20110113-merge
|
| Tue, 29 Mar 2011 17:16:18 +0100 |
luisf |
DEV Commit: some work on the publications controller and views
feature_36
|
| Tue, 29 Mar 2011 14:33:32 +0100 |
luisf |
Created the "author", "publication" and "authorship" models and controllers.
feature_36
|
| Tue, 29 Mar 2011 11:42:44 +0100 |
Chris Cannam |
Remove obsolete stub
live
|
| Tue, 29 Mar 2011 11:42:25 +0100 |
Chris Cannam |
Flip sort ordering
live
|
| Tue, 29 Mar 2011 11:16:09 +0100 |
Chris Cannam |
Merge from branch "bug_94"
live
|
| Tue, 29 Mar 2011 11:14:27 +0100 |
Chris Cannam |
Merge
cannam-pre-20110113-merge
|
| Tue, 29 Mar 2011 11:13:50 +0100 |
Chris Cannam |
Place search results refinement links immediately beneath results heading to
bug_94
|
| Tue, 29 Mar 2011 10:50:32 +0100 |
Chris Cannam |
Merge from branch "bug_70"
live
|
| Tue, 29 Mar 2011 10:49:24 +0100 |
Chris Cannam |
Merge from branch "bug_70"
cannam-pre-20110113-merge
|
| Tue, 29 Mar 2011 10:48:32 +0100 |
Chris Cannam |
Layout hack^H^H^H^Hfix
bug_70
|
| Tue, 29 Mar 2011 10:44:38 +0100 |
Chris Cannam |
Show checkout permissions message only when user logged in; some tidying and layout
bug_70
|
| Mon, 28 Mar 2011 18:17:06 +0100 |
luisf |
Merge from branch "live"
luisf
|
| Mon, 28 Mar 2011 18:08:24 +0100 |
Chris Cannam |
Merge from branch "cannam-pre-20110113-merge"
live
|
| Mon, 28 Mar 2011 18:07:06 +0100 |
Chris Cannam |
Merge from 315:de6af1693ef7
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 18:05:43 +0100 |
Chris Cannam |
Merge from branch "live"
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 18:05:05 +0100 |
Chris Cannam |
Merge from branch "feature_117"
live
|
| Mon, 28 Mar 2011 18:04:17 +0100 |
Chris Cannam |
Merge from branch "bug_97"
live
|
| Mon, 28 Mar 2011 17:50:50 +0100 |
Chris Cannam |
Merge from branch "feature_115"
live
|
| Mon, 28 Mar 2011 17:50:43 +0100 |
Chris Cannam |
Merge from branch "feature_74"
live
|
| Mon, 28 Mar 2011 17:50:25 +0100 |
Chris Cannam |
Merge from branch "feature_73"
live
|
| Mon, 28 Mar 2011 17:46:44 +0100 |
Chris Cannam |
Fix error introduced in merge
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 17:41:23 +0100 |
Chris Cannam |
Merge from branch "feature_117"
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 17:41:07 +0100 |
Chris Cannam |
Produce a single en.yml which contains British texts but describes itself as just English.
feature_117
|
| Mon, 28 Mar 2011 17:33:18 +0100 |
Chris Cannam |
Merge from branch "feature_74"
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 17:33:10 +0100 |
Chris Cannam |
Merge from branch "feature_115"
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 17:32:56 +0100 |
Chris Cannam |
Merge from branch "feature_73"
cannam-pre-20110113-merge
|
| Mon, 28 Mar 2011 17:30:04 +0100 |
Chris Cannam |
Merge from branch "bug_97"
cannam-pre-20110113-merge
|
| Fri, 25 Mar 2011 15:07:00 +0000 |
Chris Cannam |
Add a note explaining that the repo is external (if relevant) and giving its URL (do we want this?)
feature_115
|
| Fri, 25 Mar 2011 14:31:17 +0000 |
Chris Cannam |
Fix failure to handle uninitialised values; add salting version
feature_74
|
| Fri, 25 Mar 2011 13:28:44 +0000 |
Chris Cannam |
First pass at checking external repo status for read-write repo access
feature_74
|
| Thu, 24 Mar 2011 15:48:36 +0000 |
Chris Cannam |
Do not show external checkbox/field until the repo has been automatically populated
feature_73
|
| Thu, 24 Mar 2011 15:34:01 +0000 |
luisf |
created the plugin
feature_36
|
| Thu, 24 Mar 2011 13:59:03 +0000 |
Luis Figueira |
merge from branch bug_97
luisf
|
| Thu, 24 Mar 2011 13:58:03 +0000 |
Luis Figueira |
removed unnecessary debug messages
bug_97
|
| Thu, 24 Mar 2011 13:00:03 +0000 |
Luis Figueira |
merge from branch bug_97
luisf
|
| Thu, 24 Mar 2011 12:52:30 +0000 |
luisf |
fixed template variable problems; created subject label; fixed old labels
bug_97
|
| Thu, 24 Mar 2011 10:04:11 +0000 |
luisf |
new format for label variables.
bug_97
|
| Wed, 23 Mar 2011 22:22:51 +0000 |
luisf |
DEV commit: created template; need to solve bug in template variables.
bug_97
|
| Wed, 23 Mar 2011 17:38:13 +0000 |
luisf |
added feature to send mails to user when added to project; TODO: need to create template.
bug_97
|
| Wed, 23 Mar 2011 17:36:21 +0000 |
Chris Cannam |
Textual changes
feature_73
|
| Wed, 23 Mar 2011 11:33:36 +0000 |
Chris Cannam |
Merge from branch "bug_95"
live
|
| Wed, 23 Mar 2011 11:33:03 +0000 |
Chris Cannam |
Merge from branch "bug_99"
live
|
| Wed, 23 Mar 2011 11:32:11 +0000 |
Chris Cannam |
Merge from branch "bug_95"
luisf
|
| Wed, 23 Mar 2011 11:31:44 +0000 |
Chris Cannam |
Merge from branch "bug_95"
cannam-pre-20110113-merge
|
| Wed, 23 Mar 2011 11:31:14 +0000 |
Chris Cannam |
Layout changes: indent as block instead of just first line; loosen spacing at bottom of explanatory labels
bug_95
|
| Wed, 23 Mar 2011 11:19:50 +0000 |
Chris Cannam |
Merge from branch "bug_95"
cannam-pre-20110113-merge
|
| Wed, 23 Mar 2011 10:41:00 +0000 |
Chris Cannam |
Merge from branch "bug_99"
cannam-pre-20110113-merge
|
| Tue, 22 Mar 2011 14:16:09 +0000 |
luisf |
merge from branch bug_95
luisf
|
| Tue, 22 Mar 2011 14:15:18 +0000 |
luisf |
merge from bug_99
luisf
|
| Tue, 22 Mar 2011 14:14:45 +0000 |
luisf |
merge from feature_72
luisf
|
| Mon, 21 Mar 2011 18:02:56 +0000 |
luisf |
added the description; changed the roles labels. minor fixes to layout.
bug_95
|
| Mon, 21 Mar 2011 16:03:47 +0000 |
Chris Cannam |
Remove "junk code"
feature_73
|
| Mon, 21 Mar 2011 16:02:30 +0000 |
Chris Cannam |
Merge from branch "feature_72"
feature_73
|
| Mon, 21 Mar 2011 15:31:11 +0000 |
luisf |
Commented the popup dialogue line.
bug_99
|
| Mon, 21 Mar 2011 14:40:14 +0000 |
luisf |
the status messages now depend on the repository type.
feature_72
|
| Mon, 21 Mar 2011 13:31:25 +0000 |
luisf |
creates a Mercurial Repository by default.
feature_72
|
| Mon, 21 Mar 2011 13:18:32 +0000 |
luisf |
TEST DEV commit: creates the repository automatically;
feature_72
|
| Thu, 17 Mar 2011 17:44:19 +0000 |
luisf |
repository scm not showing anymore.
feature_72
|
| Tue, 15 Mar 2011 14:13:00 +0000 |
Chris Cannam |
Merge from branch "feature_88"
live
|
| Tue, 15 Mar 2011 14:12:48 +0000 |
Chris Cannam |
Merge from branch "feature_88"
cannam-pre-20110113-merge
|
| Tue, 15 Mar 2011 14:11:51 +0000 |
Chris Cannam |
Show descriptions of active files in file list. Also give them more space. Fixes #88
feature_88
|
| Tue, 15 Mar 2011 13:46:29 +0000 |
Chris Cannam |
Merge from branch "bug_89"
live
|
| Tue, 15 Mar 2011 13:45:34 +0000 |
Chris Cannam |
Merge from branch "bug_89" (fixes #89)
cannam-pre-20110113-merge
|
| Tue, 15 Mar 2011 13:44:25 +0000 |
Chris Cannam |
Loosen line spacing generally, and make some other adjustments to layout in Wiki pages in particular
bug_89
|
| Fri, 04 Mar 2011 16:12:28 +0000 |
Chris Cannam |
Sort files with active first, by default
live
|
| Fri, 04 Mar 2011 16:04:10 +0000 |
Chris Cannam |
Merge from branch "feature_80"
live
|
| Fri, 04 Mar 2011 16:02:23 +0000 |
Chris Cannam |
Add "translation"
feature_80
|
| Fri, 04 Mar 2011 15:06:11 +0000 |
Chris Cannam |
Merge from branch "feature_80"
live
|
| Fri, 04 Mar 2011 15:03:34 +0000 |
Chris Cannam |
Merge from branch "feature_80"
cannam-pre-20110113-merge
|
| Fri, 04 Mar 2011 15:03:49 +0000 |
Chris Cannam |
* Add some text explaining active toggle function; show it only where there's at least one file in the list
feature_80
|
| Fri, 04 Mar 2011 14:55:47 +0000 |
Chris Cannam |
* Remove obsolete line
feature_80
|
| Fri, 04 Mar 2011 14:50:22 +0000 |
Chris Cannam |
* Use fav/fav-off instead of true/false icons. False looks too much like delete.
feature_80
|
| Fri, 04 Mar 2011 12:46:26 +0000 |
Chris Cannam |
* Enable toggling file active state through the files interface
feature_80
|
| Thu, 03 Mar 2011 19:52:16 +0000 |
Chris Cannam |
Layout adjustments
feature_80
|
| Thu, 03 Mar 2011 19:35:02 +0000 |
Chris Cannam |
Show a star (or similar) by active files, or a checkbox if permitted to edit them. Checkbox doesn't do anything yet
feature_80
|
| Thu, 03 Mar 2011 18:31:22 +0000 |
Chris Cannam |
Naively display download "active" status in downloads page, and allow sorting by it
feature_80
|
| Thu, 03 Mar 2011 15:30:43 +0000 |
Chris Cannam |
* Add "active" column to attachments table (file downloads) in db
feature_80
|
| Thu, 03 Mar 2011 15:08:45 +0000 |
Chris Cannam |
* Restore branch menu in repo
cannam
|
| Thu, 03 Mar 2011 14:39:01 +0000 |
Chris Cannam |
* We don't use Mercurial <1.5
cannam
|
| Thu, 03 Mar 2011 14:38:43 +0000 |
Chris Cannam |
* Restore further things broken during merge
cannam
|
| Thu, 03 Mar 2011 14:17:06 +0000 |
Chris Cannam |
* Restore our favicon
cannam
|
| Thu, 03 Mar 2011 12:23:19 +0000 |
Chris Cannam |
* Fix some things broken during merge
cannam
|
| Thu, 03 Mar 2011 12:11:53 +0000 |
Chris Cannam |
* Merge from branch cannam-pre-20110113-merge
cannam
|
| Thu, 03 Mar 2011 12:02:03 +0000 |
Chris Cannam |
* Merge from default branch, bringing us up to SVN trunk rev 4993
cannam
|
| Thu, 03 Mar 2011 11:42:28 +0000 |
Chris Cannam |
* Update to SVN trunk revision 4993
|
| Thu, 03 Mar 2011 11:40:10 +0000 |
Chris Cannam |
Add some files from SVN working copy that addremove had overlooked
|
| Thu, 03 Mar 2011 11:08:15 +0000 |
Chris Cannam |
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
|
| Thu, 24 Feb 2011 15:04:51 +0000 |
Chris Cannam |
Do more-or-less the right thing to pull in and update external repos
feature_73
|
| Tue, 22 Feb 2011 17:49:00 +0000 |
Chris Cannam |
A bit more work on external repo conversion script
feature_73
|
| Tue, 22 Feb 2011 16:50:58 +0000 |
Chris Cannam |
Merge from branch "cannam-pre-20110113-merge"
feature_73
|
| Tue, 22 Feb 2011 16:48:15 +0000 |
Chris Cannam |
Merge from branch "live"
cannam-pre-20110113-merge
|
| Fri, 18 Feb 2011 10:02:10 +0000 |
Chris Cannam |
Merge from branch "bug_83"
live
|
| Fri, 18 Feb 2011 09:58:02 +0000 |
Chris Cannam |
When redirecting after login, if the current request URL is an https URL, ensure the back_url is too
bug_83
|
| Thu, 17 Feb 2011 19:48:59 +0000 |
Chris Cannam |
Merge from branch "live"
luisf
|
| Thu, 17 Feb 2011 19:48:33 +0000 |
Chris Cannam |
Merge from branch "live"
cannam-pre-20110113-merge
|
| Thu, 17 Feb 2011 19:47:09 +0000 |
Chris Cannam |
Merge from branch "feature_20"
live
|
| Thu, 17 Feb 2011 19:46:11 +0000 |
Chris Cannam |
Ensure some rather essential parameters get included (after file safety check)!
feature_20
|
| Thu, 17 Feb 2011 19:10:58 +0000 |
Chris Cannam |
Merge from branch "feature_20" (initial implementation of #20).
live
|
| Thu, 17 Feb 2011 18:35:11 +0000 |
Chris Cannam |
Merge from branch "feature_20". This initial implementation of #20 has been tested, but needs to be tested again in the proper context.
cannam-pre-20110113-merge
|
| Thu, 17 Feb 2011 16:46:09 +0000 |
Chris Cannam |
Remove two unwanted files erroneously introduced in previous merge. These have previously been removed in bb7cac2ac146, but on a different branch
live
|
| Thu, 17 Feb 2011 16:43:40 +0000 |
Chris Cannam |
Merge from branch "luisf". This merges the label change from Files to Downloads
live
|
| Thu, 17 Feb 2011 17:46:14 +0000 |
Chris Cannam |
Make use of doxysafe
feature_20
|
| Thu, 17 Feb 2011 16:33:25 +0000 |
Luis Figueira |
renamed files to downloads
luisf
|
| Thu, 17 Feb 2011 15:48:39 +0000 |
Chris Cannam |
Add a whitelisting mechanism for Doxyfile contents
feature_20
|
| Tue, 15 Feb 2011 17:23:37 +0000 |
luisf |
URL field no longer mandatory; Delete repo button removed
feature_72
|
| Tue, 15 Feb 2011 16:59:12 +0000 |
Chris Cannam |
Merge
feature_20
|
| Tue, 15 Feb 2011 16:58:46 +0000 |
Chris Cannam |
* Some work on managing ownerships etc for doc extraction
feature_20
|
| Tue, 15 Feb 2011 12:00:40 +0000 |
Chris Cannam |
Merge
feature_20
|
| Thu, 10 Feb 2011 13:43:48 +0000 |
Chris Cannam |
Merge from branch "feature_75"
feature_20
|
| Thu, 10 Feb 2011 13:43:27 +0000 |
Chris Cannam |
* Ensure route requires post action
feature_75
|
| Mon, 14 Feb 2011 15:01:39 +0000 |
luisf |
dev commit
feature_72
|
| Fri, 11 Feb 2011 16:21:55 +0000 |
Chris Cannam |
* Enable Embedded on projects that have new documentation
feature_20
|
| Fri, 11 Feb 2011 15:32:41 +0000 |
Chris Cannam |
* Start on external repo conversion script
feature_73
|
