Felix Schäfer
1ebec832af
[ #486 ] More menu items on the wiki annotate view.
2011-12-18 21:21:21 +01:00
Felix Schäfer
44cf67032f
Merge pull request #142 from elm/custom-ldap-filter
...
[#388 ] Custom LDAP filter
2011-12-18 11:13:55 -08:00
Tom Rochette
b135162c5b
Login should redirect to welcome/home page if already logged in.
2011-12-18 19:49:35 +01:00
Holger Just
81f6635878
Remove debug code. Sorry for that...
2011-12-18 15:58:42 +01:00
Holger Just
0049f82182
Redirect back to where I came from when loggin in via the menu form
2011-12-18 12:28:32 +01:00
Holger Just
58a7182e2d
Use the correct subject id for quoting
2011-12-18 12:04:13 +01:00
Eric Davis
2f0d13149d
Copyright header update
2011-12-17 15:50:52 -08:00
Eric Davis
3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
Holger Just
34fef9d8fc
Fix display of floatable TOCs in wikis
2011-12-17 22:14:19 +01:00
Holger Just
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
Holger Just
4656cf1c57
Escape raw input if there is a Liquid syntax error
2011-12-17 21:57:01 +01:00
elm
532c9cc55b
Use consistent naming to fix translation in error message
2011-12-13 20:56:43 +01:00
Eric Davis
0f8a040d28
[ #3619 ] Validate the AuthSourceLdap#custom_filter
...
Conflicts:
app/models/auth_source_ldap.rb
test/unit/auth_source_ldap_test.rb
2011-12-13 20:56:31 +01:00
Eric Davis
1318ac204e
[ #3619 ] Allow defining a custom ldap filter for AuthSourceLdap.
...
Conflicts:
app/models/auth_source_ldap.rb
config/locales/en.yml
test/unit/auth_source_ldap_test.rb
2011-12-12 13:43:21 +01:00
Eric Davis
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
Eric Davis
d2ccdc88fa
[ #760 ] Extract quick search to a partial.
...
Contributed by Peer Allan
2011-12-10 12:28:53 -08:00
Eric Davis
d32480753b
[ #692 ] Update the style of the issue show page to be cleaner
2011-12-10 12:22:38 -08:00
Eric Davis
9f0bd25523
[ #692 ] i18n English string in view
2011-12-10 12:21:34 -08:00
Eric Davis
f6d0932bff
[ #692 ] Use i18n label for the More menu
2011-12-10 11:35:12 -08:00
Eric Davis
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
Eric Davis
52ab42b5b0
[ #692 ] Add missing closing tag
2011-12-09 19:26:21 -08:00
Eric Davis
f9a2e30b9f
[ #692 ] Fix issue history styles
2011-12-09 19:04:20 -08:00
Eric Davis
a73c23ae9b
[ #692 ] Use text based logo
2011-12-09 19:04:19 -08:00
Eric Davis
0385979d5e
[ #692 ] Add register link back into the top menu
2011-12-09 19:04:19 -08:00
Eric Davis
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
Eric Davis
b312bf387a
[ #692 ] Cleanup layout structure from rebase
2011-12-09 18:06:19 -08:00
Eric Davis
32fa8cb522
[ #692 ] Fix syntax errors and undefined methods in layout from merge
2011-12-09 18:06:18 -08:00
jwollert
a1500a49b5
[ #692 ] remove duplicate header from the bottom of the ticket show view
2011-12-09 18:06:18 -08:00
Romano Licker
d22afea284
[ #692 ] header-menu subentries closer together
...
2 columns instead of 3 for issue detail
2011-12-09 18:06:17 -08:00
Romano Licker
e371bcad24
[ #692 ] fixes admin-menu
...
new design on ticket view
filter / options / attachments fieldset redesign
2011-12-09 18:06:12 -08:00
Romano Licker
0eeeb04c31
[ #692 ] removes div#admin-menu - now content of main menu
2011-12-09 14:04:02 -08:00
Romano Licker
729e801c9f
[ #692 ] renamed div#account to div#header cleanup
2011-12-09 14:03:59 -08:00
Felix Schäfer
1c84fc0f4d
Text corrections.
2011-12-09 16:57:48 +01:00
Felix Schäfer
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
Felix Schäfer
6a616a5f13
[ #740 ] Fix faulty assignment
2011-12-03 16:32:29 +01:00
Felix Schäfer
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
Holger Just
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
Felix Schäfer
42363c32f7
Better checks for previous commit.
2011-11-30 18:08:36 +01:00
Felix Schäfer
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
Felix Schäfer
add0bf4d0a
Don't double-escape project names in base layout.
2011-11-27 17:01:46 +01:00
Holger Just
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
Holger Just
28ce07b1dd
[ #734 ] Force instance_variables to string for Ruby 1.9 compatibility
2011-11-26 16:09:08 +01:00
Moritz Breit
ed0e92b1f6
[ #733 ] Add Issue#due_today? and add due-today css class
2011-11-25 21:06:29 +01:00
Felix Schäfer
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
Felix Schäfer
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
Felix Schäfer
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
Eric Davis
a0d95a87e9
[ #706 ] Add plugin hooks to projects/index
...
Contributed by David O
2011-11-25 02:21:11 -08:00
Eric Davis
e6fe1fc776
Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable
2011-11-25 01:44:19 -08:00
Holger Just
cc0526cb27
[ #604 ] Introduce compatibility layer for third party macros.
...
This be removed with complete macro removal.
2011-11-20 02:49:21 +01:00
Eric Davis
81ca15c52c
[ #604 ] Add ability to support legacy macros
2011-11-20 02:49:19 +01:00
Holger Just
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
Eric Davis
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
Eric Davis
7906afe6b9
[ #604 ] Add an IssueDrop with custom field support
2011-11-20 02:49:12 +01:00
Eric Davis
6f8d8c4105
[ #604 ] Add basic WikiPageDrop
2011-11-19 23:34:52 +01:00
Eric Davis
91914cb877
[ #604 ] Add simple Liquid drops for Projects and Principals
2011-11-19 23:33:36 +01:00
Holger Just
7261622196
[ #604 ] Add base drop
2011-11-19 23:31:58 +01:00
Moritz Breit
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
Moritz Breit
c3df17585d
[ #698 ] Fix issue queries on Ruby 1.9
2011-11-16 14:22:43 +01:00
Eric Davis
1e41ec912b
Guard against a LocalJumpError in Project#project_tree
2011-11-14 19:23:49 -08:00
Eric Davis
af9572d985
Confirm before deleting issue categories
2011-11-14 19:10:13 -08:00
Eric Davis
5f3c6b87e4
Show email notification options in a project tree
2011-11-14 18:55:39 -08:00
Felix Schäfer
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
jwollert
edce16c89a
[ #692 ] enable jump to project box to take options (projects and html)
2011-11-12 16:22:31 -08:00
Romano Licker
977f74e11a
[ #692 ] Main design changes for new theme
2011-11-12 16:22:25 -08:00
Romano Licker
734da91b4b
[ #692 ] login slidedown implemented with tabindex and focus fix
2011-11-12 16:22:24 -08:00
Eric Davis
1897459b76
[ #263 ] Refactor: move top menu logic to ApplicationHelper
2011-11-06 19:49:23 -08:00
Eric Davis
3409f5b620
[ #658 ] Include jQuery v1.7, jquery ui 1.8.16, and smoothness theme
2011-11-06 19:21:56 -08:00
Eric Davis
ab2856b53f
[ #263 ] Add new layout and theme
...
Merge branch 'ticket/unstable/263-new-layout-ready' into unstable
2011-11-06 18:18:35 -08:00
Eric Davis
f10412ef71
[ #263 ] Update tests for views in the new layout
2011-11-06 17:46:31 -08:00
Eric Davis
5620488727
[ #263 ] Removed and tweaks the design based on feedback
2011-11-06 16:39:15 -08:00
Felix Schäfer
af50984023
Better decide if journal implements the method itself. #554
2011-11-06 13:25:31 +01:00
Holger Just
9c8380667c
Merge branch 'master' into unstable
2011-10-31 18:18:44 +01:00
Holger Just
ba93eb24c4
Fix trailing whitespace
2011-10-31 17:26:14 +01:00
Holger Just
21a45b4e52
[ #676 ] Enforce UTF-8 encodings on the params hash
...
Contributed by Toshi MARUYAMA
2011-10-30 11:25:56 +01:00
Holger Just
2f4afeeb38
[ #615 ] Generate project identifier automatically with JavaScript
...
Also let the user know that the identifier must start with a lower case letter.
Contributed by Jan Schulz-Hofen.
2011-10-30 10:33:20 +01:00
Holger Just
667c4d157f
[ #591 ] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde'
2011-10-29 21:22:35 +02:00
Felix Schäfer
92dd2934ae
Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute
...
[#652 ] fixes wrong redirect after login
2011-10-29 08:47:02 -07:00
Holger Just
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
Holger Just
ec6221b7fe
Use class instead of redundant id
2011-10-29 14:28:51 +02:00
Kornelius Kalnbach
65af1e4436
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
2011-10-29 11:35:16 +02:00
Eric Davis
e51f067f12
Merge branch 'ticket/unstable/263-new-layout' into unstable
2011-10-28 15:12:59 -07:00
Eric Davis
aed2b4f661
[ #263 ] Update jquery load order and embed noConflict in the HTML head directly
2011-10-28 14:36:10 -07:00
Eric Davis
5e2d633ebb
[ #263 ] Merge common.js into application.js
2011-10-28 14:26:14 -07:00
Eric Davis
ca3eeedfff
[ #263 ] Remove profile popups, never finished
2011-10-28 14:21:41 -07:00
Eric Davis
155e1ba2a7
[ #263 ] Remove thickbox
2011-10-28 14:18:53 -07:00
Holger Just
f1a8373d49
Remove non-break space
2011-10-28 17:46:24 +02:00
Romano Licker
5036478017
[ #667 ] improved code readability
2011-10-28 17:05:36 +02:00
Romano Licker
f31999061d
[667] corrected labels and translations for reassign forms
2011-10-28 17:05:09 +02:00
Romano Licker
3bd6aa3578
[ #667 ] made labels visible as this is an accessibility issue
...
even for sighted users
2011-10-28 17:03:38 +02:00
Romano Licker
fdf660e1fd
[ #667 ] linked labels to their elements
2011-10-28 17:03:38 +02:00
Romano Licker
2b472d876d
[ #667 ] linked label to its element
2011-10-28 17:03:38 +02:00
Romano Licker
6f5fda2248
[ #667 ] set ids, created invisible labels and linked them
2011-10-28 17:03:38 +02:00
Romano Licker
4747cdce5b
[ #667 ] linked labels to their element
2011-10-28 17:03:37 +02:00
Romano Licker
c77f3a0fe7
[ #667 ] link label to element
2011-10-28 17:03:37 +02:00
Romano Licker
71271e6ff6
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
Romano Licker
297294362b
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
Romano Licker
3c04b30834
[ #667 ] added invisible label for mail notification,
...
linked label where possible
2011-10-28 17:03:37 +02:00
Romano Licker
26a7ea468a
[ #667 ] linked label to its element
2011-10-28 17:03:37 +02:00
Romano Licker
ecf6a9636a
[ #667 ] linked labels to their elements
2011-10-28 17:03:37 +02:00
Romano Licker
2c0fcd3bca
[ #667 ] added invisible labels for reassign select-tag on destroy views
2011-10-28 17:03:37 +02:00