Commit Graph

2915 Commits

Author SHA1 Message Date
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
Romano Licker 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
Romano Licker 207af21553 [#667] set id for message_subject and linked it to label,
added invisible label
2011-10-28 17:03:36 +02:00
Romano Licker 4717a242cb [#667] link label to element 2011-10-28 17:03:36 +02:00
Romano Licker 2e688efa70 [#667] link label to element 2011-10-28 17:03:36 +02:00
Romano Licker 0f5d38ca4b [#667] linked labels to their elements 2011-10-28 17:03:35 +02:00
Romano Licker bf23c06d93 [#667] added invisible labels for queries 2011-10-28 17:03:35 +02:00
Romano Licker cd7b30dac6 [#667] added invisible search label 2011-10-28 17:03:35 +02:00
Romano Licker 5ab9ed889c [#667] added invisible project scope label 2011-10-28 17:03:35 +02:00
Romano Licker bf8de58548 [#667] added 'for' to link them 2011-10-28 17:03:35 +02:00
Eric Davis 981e74f822 [#668] Remove duplicate module fields when copying projects 2011-10-25 18:23:37 -07:00
Eric Davis 2b7a221dee [#672] Allow each Query to control if subprojects are included or not 2011-10-25 18:13:32 -07:00
Eric Davis 5603103295 [#240] Add link to all News on the Project list page 2011-10-25 15:49:32 -07:00
Eric Davis b9d186e676 [#277] Show avatars on the News list 2011-10-25 15:49:31 -07:00
Eric Davis a8e997dbf6 Fully qualify column names 2011-10-14 17:09:46 -07:00
Gregor Schmidt 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
Romano Licker 34dc06a85f [#652] fixes wrong redirect after login
when url contains umlaute
2011-10-11 18:16:43 +02:00
Holger Just d467f79214 Merge remote-tracking branch 'refs/remotes/thegcat/feature/566-more_watchers_to_filter_by' 2011-10-04 10:28:39 +02:00
Felix Schäfer 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
Felix Schäfer b47a90b424 Allow to filter watchers by more than just "me". #566 2011-10-03 09:52:00 +02:00
Felix Schäfer 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
Felix Schäfer 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
Holger Just c57c598204 Fix trailing whitespace 2011-08-27 18:26:12 +02:00
Felix Schäfer a24a24eb19 Add deferred loading for plugins which's requirements aren't all met yet #256 2011-08-25 18:46:53 +02:00
Felix Schäfer 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
Gregor Schmidt 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
Nick Peelman 2bb19b3e31 Adding check all links to new project form.
Makes bulk changes that much faster...
2011-08-08 19:53:33 -04:00
Nick Peelman b8d0aa0b85 Adding id attribute to modules field set on project form. 2011-08-08 19:53:22 -04:00
Eric Davis 7f06e7394c [#263] Update SAP theme 2011-08-05 11:32:21 -07:00
Eric Davis 4b8f4c3b83 [#263] Allow setting the page header title 2011-08-05 10:45:48 -07:00
Eric Davis 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
Eric Davis b4804f4ce4 [#263] Merged redmine-reset.css into application.css 2011-08-05 09:28:52 -07:00
Eric Davis ffa2d5f319 [#263] Remove the tree of parent issues from the issue title 2011-08-05 09:01:03 -07:00
Eric Davis 156cdf316e [#263] Remove duplicated updated label 2011-08-05 08:56:28 -07:00
Eric Davis a7ab39dd31 [#557] Fix link_to_month to not escape the HTML arrow characters 2011-08-05 08:49:22 -07:00
Eric Davis 4d48a6b675 Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string'
Conflicts:
	app/helpers/repositories_helper.rb
2011-08-05 08:30:21 -07:00
Eric Davis 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
Holger Just 54b4fdf1aa [#124] Allow to delete users with STATE_REGISTERED 2011-08-02 02:27:37 +02:00
Holger Just fc84783de1 [#124] Validate user status changes 2011-08-02 02:26:55 +02:00
Eric Davis 2c46411678 [#547] Security audit 2011-08-01 16:00:23 -07:00
Tom Rochette 552cd8dc57 Replace hardcoded string "diff" in Wiki#show and Repositories_Helper. 2011-07-31 09:27:13 -04:00
Tom Rochette aa6bf25b39 Replaced french word "anonyme" with label_user_anonymous. 2011-07-31 08:57:58 -04:00
Eric Davis 635923f90d [#263] Fix admin menu sidebar styling 2011-07-29 15:33:59 -07:00
Eric Davis 8f45e780ce [#263] Fix issue subject style 2011-07-29 15:33:43 -07:00