Holger Just
d7ebffb7ad
[ #795 ] Generate error flash on Liquid syntax error
2012-01-16 14:10:45 +01:00
Holger Just
3c3eb2f7e7
[ #790 ] Register variables with an API
2012-01-05 23:36:29 +01:00
Holger Just
0c87f611e9
Merge branch 'master' into unstable
...
Conflicts:
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/es.yml
config/locales/eu.yml
config/locales/fa.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mk.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml
db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
Holger Just
e95b4992e4
Update copyright for 2012
...
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".
-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2012-01-03 20:36:40 +01:00
Eric Davis
c51d339512
[ #809 ] Multiple projects can now be assigned to a group or user.
...
* Added a Javascript autocomplete for searching Projects
* Updated the Users and Groups controllers' #edit_membership method to
create/update multiple Member records
2011-12-29 09:30:32 -08:00
Eric Davis
16943d04f7
[ #802 ] Use the group.png icon as a Group avatar
2011-12-27 17:38:34 -08:00
Eric Davis
8160cd02bd
[ #800 #801 ] Add Javascript search to bulk add watchers to issues.
2011-12-27 17:09:24 -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
Eric Davis
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
Eric Davis
f9a2e30b9f
[ #692 ] Fix issue history styles
2011-12-09 19:04:20 -08:00
Eric Davis
32fa8cb522
[ #692 ] Fix syntax errors and undefined methods in layout from merge
2011-12-09 18:06:18 -08: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
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
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
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
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
Eric Davis
1897459b76
[ #263 ] Refactor: move top menu logic to ApplicationHelper
2011-11-06 19:49:23 -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
Holger Just
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
Eric Davis
e51f067f12
Merge branch 'ticket/unstable/263-new-layout' into unstable
2011-10-28 15:12:59 -07: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
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
Eric Davis
4b8f4c3b83
[ #263 ] Allow setting the page header title
2011-08-05 10:45:48 -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
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
Holger Just
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +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
Eric Davis
8f45e780ce
[ #263 ] Fix issue subject style
2011-07-29 15:33:43 -07:00
Eric Davis
e7e4557009
[ #263 ] Fix journal formatting
2011-07-29 15:04:03 -07:00
Eric Davis
5949f8de91
Port issue history changes
2011-07-29 14:37:24 -07:00
Eric Davis
c23f73e9fe
Port ApplicationHelper patches
2011-07-29 14:31:26 -07:00
Eric Davis
70c3e1c8f9
[ #544 ] html_escape issue fields
2011-07-29 09:25:13 -07:00
Holger Just
76490fcda5
Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail'
2011-07-27 16:03:14 +02:00
Gregor Schmidt
8c9034f41e
[ #539 ] removing dead code - this went into JournalFormatter
2011-07-26 23:00:47 +02:00
Eric Davis
2d98a486d6
Fix failing test due to invalid HTML and missing initial journal
2011-07-22 11:52:55 -07:00
Eric Davis
97dd339bbb
[ #191 ] Refactor: extract methods to helper
2011-07-08 14:59:23 -07:00
Holger Just
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
