Commit Graph

5192 Commits

Author SHA1 Message Date
Holger Just d24e8186b4 Merge remote-tracking branch 'chiliproject/master' into unstable 2011-12-18 21:33:05 +01:00
Felix Schäfer 1ebec832af [#486] More menu items on the wiki annotate view. 2011-12-18 21:21:21 +01:00
Felix Schäfer d71a74bcbe Explicit name for the example slapd config ldif. 2011-12-18 20:45:01 +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 bde0f6a862 Fix line endings from \r\n to \n 2011-12-18 19:30:46 +01:00
Holger Just 6c690814c9 [#463] Pass through Basic Auth in an FCGI setup 2011-12-18 19:30:37 +01:00
Holger Just 81f6635878 Remove debug code. Sorry for that... 2011-12-18 15:58:42 +01:00
Holger Just ba6fcfeca9 Override some filters of Liquid core.
These filters change the implemntation of sub and gsub to use the block method.
This prevents the evaluation of backreferences in the replacement text. See
https://gist.github.com/1491437 for examples.

Also, it allows split to be called without arguments to split strings on
whitespace.
2011-12-18 15:54:09 +01:00
Holger Just 2733e5173f Fix trailing whitespace 2011-12-18 15:49:18 +01:00
Holger Just 6b725c32e6 Add wiki formatting for h4 2011-12-18 15:49:00 +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 d583c94b5f Update locales 2011-12-17 15:49:28 -08:00
Eric Davis 3a16f3f5b1 Merge remote-tracking branch 'upstream/master' into unstable 2011-12-17 15:20:58 -08:00
Holger Just 04eb115da7 Add identity tag which just returns whatever was entered as input 2011-12-17 23:49:25 +01: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 7458bca34b Don't create arguments for legacy tags if there aren't any 2011-12-17 22:14:19 +01:00
Holger Just 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
Holger Just 4656cf1c57 Escape raw input if there is a Liquid syntax error 2011-12-17 21:57:01 +01:00
Jean-Philippe Lang 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
Holger Just 611889f3f7 [#748] Use SCM commands to detect the revision 2011-12-15 22:08:18 +01:00
elm 48737b0c6f Add OpenLDAP config ldif for redmine database 2011-12-13 20:56:43 +01:00
elm bf7bcec1da Remove internal LDAP entries to make the ldif importable. 2011-12-13 20:56:43 +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 100faf94f7 [#692] Add some style to issue action menus 2011-12-10 12:16:54 -08:00
Eric Davis f6d0932bff [#692] Use i18n label for the More menu 2011-12-10 11:35:12 -08:00
Eric Davis 2a74699196 [#692] Make breadcrumbs larger and not completely underlined 2011-12-10 11:30:38 -08:00
Eric Davis ee48a8da4f Merge branch 'ticket/unstable/692-final-design' into unstable 2011-12-10 10:40:09 -08:00
Felix Schäfer 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
Eric Davis 52ab42b5b0 [#692] Add missing closing tag 2011-12-09 19:26:21 -08:00
Eric Davis e8b8841717 [#692] Fix image names 2011-12-09 19:04:20 -08:00
Eric Davis f9a2e30b9f [#692] Fix issue history styles 2011-12-09 19:04:20 -08:00
Eric Davis 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
Eric Davis 8e6ccceb28 [#692] Remove selected gradient from context menu tables 2011-12-09 19:04:19 -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 971277b507 [#692] Fix failing test due to design changes 2011-12-09 18:06:19 -08:00
Eric Davis c33227ffe3 [#692] Update CSS by reviewing pre and post-merge diff 2011-12-09 18:06:18 -08:00
Eric Davis 32fa8cb522 [#692] Fix syntax errors and undefined methods in layout from merge 2011-12-09 18:06:18 -08:00