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
f6d0932bff
[ #692 ] Use i18n label for the More menu
2011-12-10 11:35:12 -08:00
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
52ab42b5b0
[ #692 ] Add missing closing tag
2011-12-09 19:26:21 -08:00
f9a2e30b9f
[ #692 ] Fix issue history styles
2011-12-09 19:04:20 -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
32fa8cb522
[ #692 ] Fix syntax errors and undefined methods in layout from merge
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
1c84fc0f4d
Text corrections.
2011-12-09 16:57:48 +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
1d21cab2e4
Merge branch 'master' into unstable
...
Conflicts:
app/views/projects/index.rhtml
lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
24538a4af2
[ #735 ] Log time form on issue update should only be displayed with log_time permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:28:20 +01:00
42363c32f7
Better checks for previous commit.
2011-11-30 18:08:36 +01:00
f333f43a57
[ #736 ] force recipients/cc to arrays in the Mailer
...
String#delete might break on 1.9 with dashes in the author's email address. Furthermore, String#delete doesn't do what the original author thought it does.
2011-11-30 18:04:09 +01:00
add0bf4d0a
Don't double-escape project names in base layout.
2011-11-27 17:01:46 +01:00
9f4d12ffdf
[ #734 ] Don't modify text inline.
...
This is not only a wee bit faster (yay!) but also allows use to deal with
frozen strings and doesn't change content which might inadvertently be saved
later on. And it fixes some broken tests on Ruby 1.9 :)
2011-11-26 16:10:24 +01:00
28ce07b1dd
[ #734 ] Force instance_variables to string for Ruby 1.9 compatibility
2011-11-26 16:09:08 +01:00
8b7ee93f90
Merge pull request #124 from mbreit/bugfix/707-wiki-diff-encoding-error-ruby19
...
[#707 ] Fix encoding error on wiki diffs on Ruby 1.9
2011-11-25 09:48:52 -08:00
03d956c360
Merge pull request #90 from meineerde/issues/master/124-delete-registered-users
...
[124] delete registered users
2011-11-25 09:47:12 -08:00
a80f822481
Merge pull request #123 from mbreit/bugfix/698-issue-query-ruby19
...
[#698 ] Fix single-value query atoms in issue queries on Ruby 1.9
2011-11-25 09:45:49 -08:00
a0d95a87e9
[ #706 ] Add plugin hooks to projects/index
...
Contributed by David O
2011-11-25 02:21:11 -08:00
e6fe1fc776
Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable
2011-11-25 01:44:19 -08:00
cc0526cb27
[ #604 ] Introduce compatibility layer for third party macros.
...
This be removed with complete macro removal.
2011-11-20 02:49:21 +01:00
81ca15c52c
[ #604 ] Add ability to support legacy macros
2011-11-20 02:49:19 +01:00
82432f3f99
[ #604 ] Evaluate Liquid before Textile-to-HTML transformation.
...
This changes how the liquid integration works. It now integrates the Textile
conversion step. This was necessary because if you first convert the snippets
inside of loops and conditionals from Textile to HTML, you loose some
important context information which is required to e.g. build proper lists in
textile.
We expect the standard case that Liquid tags return Textile markup instead
of HTML. Thus, we can convert the final textile markup to HTML as a very last
step.
To allow existing and new macros (or tags) to return HTML for advanced usage,
we save their respective output into the context and put a placeholder string
into the generated markup. After the transformation to HTML, we insert the
previously generated HTML into the string using search+replace in
lib/chili_project/liquid/template.rb. Tags have to be registered using
:html => true for this special treatment.
2011-11-20 02:49:19 +01:00
72fa3ff920
[ #604 ] Run the output of the WikiFormatted text into Liquid
...
The current view's instance variables are sent to liquid dynamically
2011-11-20 02:49:19 +01:00
7906afe6b9
[ #604 ] Add an IssueDrop with custom field support
2011-11-20 02:49:12 +01:00
6f8d8c4105
[ #604 ] Add basic WikiPageDrop
2011-11-19 23:34:52 +01:00
91914cb877
[ #604 ] Add simple Liquid drops for Projects and Principals
2011-11-19 23:33:36 +01:00
7261622196
[ #604 ] Add base drop
2011-11-19 23:31:58 +01:00
60db868470
[ #707 ] Fix encoding error on wiki diffs on Ruby 1.9
...
WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.
2011-11-16 17:39:26 +01:00
c3df17585d
[ #698 ] Fix issue queries on Ruby 1.9
2011-11-16 14:22:43 +01:00
1e41ec912b
Guard against a LocalJumpError in Project#project_tree
2011-11-14 19:23:49 -08:00
af9572d985
Confirm before deleting issue categories
2011-11-14 19:10:13 -08:00
5f3c6b87e4
Show email notification options in a project tree
2011-11-14 18:55:39 -08:00
b1671e46f0
Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
...
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
edce16c89a
[ #692 ] enable jump to project box to take options (projects and html)
2011-11-12 16:22:31 -08:00
977f74e11a
[ #692 ] Main design changes for new theme
2011-11-12 16:22:25 -08:00
734da91b4b
[ #692 ] login slidedown implemented with tabindex and focus fix
2011-11-12 16:22:24 -08:00
1897459b76
[ #263 ] Refactor: move top menu logic to ApplicationHelper
2011-11-06 19:49:23 -08:00
3409f5b620
[ #658 ] Include jQuery v1.7, jquery ui 1.8.16, and smoothness theme
2011-11-06 19:21:56 -08:00
Eric Davis
jwollert
Romano Licker
Felix Schäfer
Holger Just
Moritz Breit