Commit Graph

5321 Commits

Author SHA1 Message Date
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
Romano Licker 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
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
jwollert 7e287d6e5a [#692] fixes IE7 overflow bug in project search results 2011-12-09 13:57:24 -08:00
Eric Davis 94f7bef2c6 Merge branch 'ticket/master/298-separate-plugin-path' 2011-12-09 13:43:21 -08:00
Felix Schäfer 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
Eric Davis 7d1c0374e4 Merge branch 'ticket/unstable/747-capybara' into unstable 2011-12-09 13:28:33 -08:00
Felix Schäfer fbde6859d1 Merge branch 'rubychan-coderay-1.0' into unstable 2011-12-09 16:58:24 +01:00
Felix Schäfer 1c84fc0f4d Text corrections. 2011-12-09 16:57:48 +01:00
Felix Schäfer 8671006b70 [#649] Prevent the extra wiki styles from interfering with code highlighting. 2011-12-09 16:57:16 +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
Spencer Markowski 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
Felix Schäfer 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
Felix Schäfer 6a616a5f13 [#740] Fix faulty assignment 2011-12-03 16:32:29 +01:00
Eric Davis b32fc97314 [#747] Add some capybara helper methods 2011-12-01 18:13:27 -08:00
Eric Davis a2feb14c83 [#747] Include capybara for integration tests 2011-12-01 16:46:50 -08:00
Eric Davis 4b5d4307d2 Merge branch 'ticket/unstable/720-tagging' into unstable 2011-12-01 15:58:29 -08:00
Eric Davis f179fea7bf [#720] Use = to show the explicit dependency 2011-12-01 15:58:05 -08:00
Holger Just 579061c794 Move shebang of rdm-mailhandler.rb back to the top. 2011-12-01 20:58:14 +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