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
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
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
6a616a5f13
[ #740 ] Fix faulty assignment
2011-12-03 16:32:29 +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
ed0e92b1f6
[ #733 ] Add Issue#due_today? and add due-today css class
2011-11-25 21:06:29 +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
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
f10412ef71
[ #263 ] Update tests for views in the new layout
2011-11-06 17:46:31 -08:00
5620488727
[ #263 ] Removed and tweaks the design based on feedback
2011-11-06 16:39:15 -08:00
af50984023
Better decide if journal implements the method itself. #554
2011-11-06 13:25:31 +01:00
9c8380667c
Merge branch 'master' into unstable
2011-10-31 18:18:44 +01:00
ba93eb24c4
Fix trailing whitespace
2011-10-31 17:26:14 +01:00
21a45b4e52
[ #676 ] Enforce UTF-8 encodings on the params hash
...
Contributed by Toshi MARUYAMA
2011-10-30 11:25:56 +01:00
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
667c4d157f
[ #591 ] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde'
2011-10-29 21:22:35 +02:00
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
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
ec6221b7fe
Use class instead of redundant id
2011-10-29 14:28:51 +02:00
65af1e4436
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
2011-10-29 11:35:16 +02:00
e51f067f12
Merge branch 'ticket/unstable/263-new-layout' into unstable
2011-10-28 15:12:59 -07:00
aed2b4f661
[ #263 ] Update jquery load order and embed noConflict in the HTML head directly
2011-10-28 14:36:10 -07:00
5e2d633ebb
[ #263 ] Merge common.js into application.js
2011-10-28 14:26:14 -07:00
ca3eeedfff
[ #263 ] Remove profile popups, never finished
2011-10-28 14:21:41 -07:00
155e1ba2a7
[ #263 ] Remove thickbox
2011-10-28 14:18:53 -07:00
f1a8373d49
Remove non-break space
2011-10-28 17:46:24 +02:00
5036478017
[ #667 ] improved code readability
2011-10-28 17:05:36 +02:00
f31999061d
[667] corrected labels and translations for reassign forms
2011-10-28 17:05:09 +02:00
3bd6aa3578
[ #667 ] made labels visible as this is an accessibility issue
...
even for sighted users
2011-10-28 17:03:38 +02:00
fdf660e1fd
[ #667 ] linked labels to their elements
2011-10-28 17:03:38 +02:00
2b472d876d
[ #667 ] linked label to its element
2011-10-28 17:03:38 +02:00
6f5fda2248
[ #667 ] set ids, created invisible labels and linked them
2011-10-28 17:03:38 +02:00
4747cdce5b
[ #667 ] linked labels to their element
2011-10-28 17:03:37 +02:00
c77f3a0fe7
[ #667 ] link label to element
2011-10-28 17:03:37 +02:00
71271e6ff6
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
297294362b
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
3c04b30834
[ #667 ] added invisible label for mail notification,
...
linked label where possible
2011-10-28 17:03:37 +02:00
26a7ea468a
[ #667 ] linked label to its element
2011-10-28 17:03:37 +02:00
ecf6a9636a
[ #667 ] linked labels to their elements
2011-10-28 17:03:37 +02:00
2c0fcd3bca
[ #667 ] added invisible labels for reassign select-tag on destroy views
2011-10-28 17:03:37 +02:00
2f5cf020f3
[ #667 ] set unique id for each checkbox and linked it
...
added "no-css" class to overwrite the current label style
2011-10-28 17:03:36 +02:00
207af21553
[ #667 ] set id for message_subject and linked it to label,
...
added invisible label
2011-10-28 17:03:36 +02:00
4717a242cb
[ #667 ] link label to element
2011-10-28 17:03:36 +02:00
2e688efa70
[ #667 ] link label to element
2011-10-28 17:03:36 +02:00
0f5d38ca4b
[ #667 ] linked labels to their elements
2011-10-28 17:03:35 +02:00
bf23c06d93
[ #667 ] added invisible labels for queries
2011-10-28 17:03:35 +02:00
cd7b30dac6
[ #667 ] added invisible search label
2011-10-28 17:03:35 +02:00
5ab9ed889c
[ #667 ] added invisible project scope label
2011-10-28 17:03:35 +02:00
bf8de58548
[ #667 ] added 'for' to link them
2011-10-28 17:03:35 +02:00
981e74f822
[ #668 ] Remove duplicate module fields when copying projects
2011-10-25 18:23:37 -07:00
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
5603103295
[ #240 ] Add link to all News on the Project list page
2011-10-25 15:49:32 -07:00
b9d186e676
[ #277 ] Show avatars on the News list
2011-10-25 15:49:31 -07:00
a8e997dbf6
Fully qualify column names
2011-10-14 17:09:46 -07:00
c1ecadbff7
Moving query related models into separate files
...
This should enable easier overwriting/reloading in plugins, since now the autoloader is able to find the models.
2011-10-12 11:35:26 +02:00
34dc06a85f
[ #652 ] fixes wrong redirect after login
...
when url contains umlaute
2011-10-11 18:16:43 +02:00
d467f79214
Merge remote-tracking branch 'refs/remotes/thegcat/feature/566-more_watchers_to_filter_by'
2011-10-04 10:28:39 +02:00
0d306a8bfc
Merge pull request #93 from peelman/form-attribute-changes
...
Adding Check All / Uncheck All on New Project form. #644
2011-10-03 01:18:59 -07:00
b47a90b424
Allow to filter watchers by more than just "me". #566
2011-10-03 09:52:00 +02:00
aac42afdaa
Add setting to set today as the start date for new issues. #355
...
Patch contributed by Bruno Medeiros on http://www.redmine.org/issues/2277
2011-10-02 22:02:29 +02:00
225a1587a6
Show the correct authors in wiki diff view.
...
#author doesn't show the author of the journal but of the journaled object.
2011-09-10 09:21:45 +02:00
c57c598204
Fix trailing whitespace
2011-08-27 18:26:12 +02:00
a24a24eb19
Add deferred loading for plugins which's requirements aren't all met yet #256
2011-08-25 18:46:53 +02:00
3d03a3eda5
Merge pull request #96 from finnlabs/pulls/573/fix_aas_in_wiki_content
...
[#573 ] acts_as_searchable definition in WikiPage may be insufficient and cause SQL errors
2011-08-21 08:56:21 -07:00
962b35e11a
[ #573 ] Being more explicit about search fields to make sure, that AR joins all tables properly
2011-08-11 10:05:34 +02:00
2bb19b3e31
Adding check all links to new project form.
...
Makes bulk changes that much faster...
2011-08-08 19:53:33 -04:00
b8d0aa0b85
Adding id attribute to modules field set on project form.
2011-08-08 19:53:22 -04:00
7f06e7394c
[ #263 ] Update SAP theme
2011-08-05 11:32:21 -07:00
4b8f4c3b83
[ #263 ] Allow setting the page header title
2011-08-05 10:45:48 -07:00
9bb8f80d7e
[ #263 ] Merging css
...
* Append main.css to the bottom of application.css
* Remove main.css
* Move print styles out to print.css
* Move the CSS reset to be loaded first
* Port some colors to color.css
2011-08-05 09:56:13 -07:00
b4804f4ce4
[ #263 ] Merged redmine-reset.css into application.css
2011-08-05 09:28:52 -07:00
ffa2d5f319
[ #263 ] Remove the tree of parent issues from the issue title
2011-08-05 09:01:03 -07:00
156cdf316e
[ #263 ] Remove duplicated updated label
2011-08-05 08:56:28 -07:00
a7ab39dd31
[ #557 ] Fix link_to_month to not escape the HTML arrow characters
2011-08-05 08:49:22 -07:00
4d48a6b675
Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string'
...
Conflicts:
app/helpers/repositories_helper.rb
2011-08-05 08:30:21 -07:00
30e81bed5c
Merge remote-tracking branch 'tomzx/b551_hardcoded_french_string'
...
Conflicts:
app/views/wiki/annotate.rhtml
app/views/wiki/diff.rhtml
app/views/wiki/show.rhtml
2011-08-05 08:27:49 -07:00
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +02:00
fc84783de1
[ #124 ] Validate user status changes
2011-08-02 02:26:55 +02:00
2c46411678
[ #547 ] Security audit
2011-08-01 16:00:23 -07:00
552cd8dc57
Replace hardcoded string "diff" in Wiki#show and Repositories_Helper.
2011-07-31 09:27:13 -04:00
aa6bf25b39
Replaced french word "anonyme" with label_user_anonymous.
2011-07-31 08:57:58 -04:00
635923f90d
[ #263 ] Fix admin menu sidebar styling
2011-07-29 15:33:59 -07:00
8f45e780ce
[ #263 ] Fix issue subject style
2011-07-29 15:33:43 -07:00
124c98d4ba
[ #263 ] Fix for changes to the admin_menu
2011-07-29 15:06:09 -07:00
8c183dda2e
[ #263 ] Fix XSS regression from merge
2011-07-29 15:04:22 -07:00
e7e4557009
[ #263 ] Fix journal formatting
2011-07-29 15:04:03 -07:00
5cedd5cdcb
[ #263 ] Don't output heads_for_wiki_formatter
2011-07-29 14:46:39 -07:00
cf40447356
Fix the thickbox loading image path
2011-07-29 14:43:33 -07:00
6c9c85134a
Fix the issue action bar CSS
2011-07-29 14:43:33 -07:00
6435905132
Port issue show view
2011-07-29 14:43:33 -07:00
ce973429fe
Move the Add link next to the Related issues label
2011-07-29 14:37:24 -07:00
cff91d8cf0
Port id selectors to the main issues list
2011-07-29 14:37:24 -07:00
13f57032c1
Add the new issue button partial
2011-07-29 14:37:24 -07:00
7485858da2
Cleanup styles in the issue filter section
2011-07-29 14:37:24 -07:00
2dc0e100c3
Port the issue filter section on the issues list
2011-07-29 14:37:24 -07:00
5949f8de91
Port issue history changes
2011-07-29 14:37:24 -07:00
ec21b4c075
Merge issue context menu changes
2011-07-29 14:32:53 -07:00
84ef979c47
Add welcome text to the project list
2011-07-29 14:31:27 -07:00
6d522a9acd
Remove the list of versions from sidebar, will be moved to menu
2011-07-29 14:31:26 -07:00
48675d63a5
Clean up footer
2011-07-29 14:31:26 -07:00
c23f73e9fe
Port ApplicationHelper patches
2011-07-29 14:31:26 -07:00
484ed29fa2
Port main layout
2011-07-29 14:29:23 -07:00
1f57eb01b1
Merge HTML head section
2011-07-29 14:25:35 -07:00
Eric Davis
jwollert
Romano Licker
Felix Schäfer
Holger Just
Moritz Breit
Kornelius Kalnbach
Gregor Schmidt
Felix Schäfer
Nick Peelman
Tom Rochette