d583c94b5f
Update locales
2011-12-17 15:49:28 -08:00
3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
04eb115da7
Add identity tag which just returns whatever was entered as input
2011-12-17 23:49:25 +01:00
34fef9d8fc
Fix display of floatable TOCs in wikis
2011-12-17 22:14:19 +01:00
e2c57fd12d
Make floated TOCs in wikis compatible with the Liquid engine
...
The floated tags (>toc and <toc) are invalid syntax because of the < and >
characters. We transform them to toc_left and toc_right instead.
2011-12-17 22:14:19 +01:00
7458bca34b
Don't create arguments for legacy tags if there aren't any
2011-12-17 22:14:19 +01:00
60deeb5306
Move definiton of liquid legacy tags into the Legacy module.
...
This is required to retaiun the definition in development mode as the module
is stragely reloaded.
2011-12-17 22:01:20 +01:00
4656cf1c57
Escape raw input if there is a Liquid syntax error
2011-12-17 21:57:01 +01:00
0d69fa6bb1
Patch for ruby1.9.3 compatibility.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8234 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-16 14:34:22 +01:00
611889f3f7
[ #748 ] Use SCM commands to detect the revision
2011-12-15 22:08:18 +01:00
b2998c3972
Merge pull request #132 from mbreit/feature/733-issue-due-today
...
[#733 ] Add Issue#due_today? and add due-today css class
2011-12-10 13:29:27 -08:00
d2ccdc88fa
[ #760 ] Extract quick search to a partial.
...
Contributed by Peer Allan
2011-12-10 12:28:53 -08:00
d32480753b
[ #692 ] Update the style of the issue show page to be cleaner
2011-12-10 12:22:38 -08:00
9f0bd25523
[ #692 ] i18n English string in view
2011-12-10 12:21:34 -08:00
100faf94f7
[ #692 ] Add some style to issue action menus
2011-12-10 12:16:54 -08:00
f6d0932bff
[ #692 ] Use i18n label for the More menu
2011-12-10 11:35:12 -08:00
2a74699196
[ #692 ] Make breadcrumbs larger and not completely underlined
2011-12-10 11:30:38 -08:00
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
05092b2737
Merge pull request #139 from esmarkowski/patch-1
...
[#761 ] Fix quotation of since date in git adapter
2011-12-10 02:31:05 -08:00
52ab42b5b0
[ #692 ] Add missing closing tag
2011-12-09 19:26:21 -08:00
e8b8841717
[ #692 ] Fix image names
2011-12-09 19:04:20 -08:00
f9a2e30b9f
[ #692 ] Fix issue history styles
2011-12-09 19:04:20 -08:00
f76c922dd8
[ #692 ] Fix the context menu styles
...
It was conflicting with S&P theme styles due to the CSS load order,
reset them back to the pre-S&P theme style.
2011-12-09 19:04:20 -08:00
8e6ccceb28
[ #692 ] Remove selected gradient from context menu tables
2011-12-09 19:04:19 -08:00
a73c23ae9b
[ #692 ] Use text based logo
2011-12-09 19:04:19 -08:00
0385979d5e
[ #692 ] Add register link back into the top menu
2011-12-09 19:04:19 -08:00
612f2f98e4
[ #692 ] Fix and simplify the top menu open/closing
...
* Remove bunch of extra code from choosen
* Fix awkward indention
* Add admin menu items to the Modules menu
* Turn off bold on menu item hover, was causing jumping in width
* Fix color on opened top menus
* Fix a bunch of edge cases in the menu clicks.
* Remove gross 'html' binding in favor of a one time only one
2011-12-09 19:04:08 -08:00
b312bf387a
[ #692 ] Cleanup layout structure from rebase
2011-12-09 18:06:19 -08:00
971277b507
[ #692 ] Fix failing test due to design changes
2011-12-09 18:06:19 -08:00
c33227ffe3
[ #692 ] Update CSS by reviewing pre and post-merge diff
2011-12-09 18:06:18 -08:00
32fa8cb522
[ #692 ] Fix syntax errors and undefined methods in layout from merge
2011-12-09 18:06:18 -08:00
83f8f63640
[ #692 ] implemented widget design for mypage
...
- background gradient image missing
- made icon grey in order to keep it visible
- raised icon margin to position it directly inside the
widget when in personalize mode
- added a background image to display the gradient
2011-12-09 18:06:18 -08:00
a1500a49b5
[ #692 ] remove duplicate header from the bottom of the ticket show view
2011-12-09 18:06:18 -08:00
d22afea284
[ #692 ] header-menu subentries closer together
...
2 columns instead of 3 for issue detail
2011-12-09 18:06:17 -08:00
e371bcad24
[ #692 ] fixes admin-menu
...
new design on ticket view
filter / options / attachments fieldset redesign
2011-12-09 18:06:12 -08:00
0eeeb04c31
[ #692 ] removes div#admin-menu - now content of main menu
2011-12-09 14:04:02 -08:00
729e801c9f
[ #692 ] renamed div#account to div#header cleanup
2011-12-09 14:03:59 -08:00
7e287d6e5a
[ #692 ] fixes IE7 overflow bug in project search results
2011-12-09 13:57:24 -08:00
94f7bef2c6
Merge branch 'ticket/master/298-separate-plugin-path'
2011-12-09 13:43:21 -08:00
ba0ded88c3
Merge pull request #125 from finnlabs/pulls/708/journal_class_name_in_attribute
...
Bug #708 : AAJ does not create journals, when models are created using sub classes
2011-12-09 13:36:40 -08:00
7d1c0374e4
Merge branch 'ticket/unstable/747-capybara' into unstable
2011-12-09 13:28:33 -08:00
fbde6859d1
Merge branch 'rubychan-coderay-1.0' into unstable
2011-12-09 16:58:24 +01:00
1c84fc0f4d
Text corrections.
2011-12-09 16:57:48 +01:00
8671006b70
[ #649 ] Prevent the extra wiki styles from interfering with code highlighting.
2011-12-09 16:57:16 +01:00
aa88fe8e39
Merge branch 'coderay-1.0' of https://github.com/rubychan/chiliproject into rubychan-coderay-1.0
2011-12-09 16:50:20 +01:00
b264a8ee3f
Encloses since date in single quotes. This was causing git to respond with fatal: Unknown Object and preventing revisions from being updated.
2011-12-08 23:51:15 -05:00
d943efd0eb
[ #748 ] Make ChiliProject::Version.revision more resilient
...
* Won't output errors when the ChiliProject git repo isn't there anymore,
* Works even if not invoked from the ChiliProject root directory,
* Moved the formatting logic to the git call.
2011-12-03 17:39:52 +01:00
6a616a5f13
[ #740 ] Fix faulty assignment
2011-12-03 16:32:29 +01:00
b32fc97314
[ #747 ] Add some capybara helper methods
2011-12-01 18:13:27 -08:00
a2feb14c83
[ #747 ] Include capybara for integration tests
2011-12-01 16:46:50 -08:00
Eric Davis
Holger Just
Jean-Philippe Lang
Felix Schäfer
Romano Licker
jwollert
Spencer Markowski