3af5544dbc
[LSS#4190] Add watching to documents
2011-12-27 13:16:52 -08:00
72eadcc6ea
[ #796 ] Adds date range filter.
...
Based on r6226 from Redmine by Jean-Philippe Lang
2011-12-27 13:02:46 -08:00
260e8b84f8
[ #674 ] Convert outbound mail to be sent per-recipient
...
Instead of a single email that is sent out with all the recipients as CC/BCC,
each recipient will be delivered their own email. This will let emails to be
customized per user based on their permissions, without exposing private data.
2011-12-26 16:58:43 -08:00
745f889e92
Enforce UTF-8 source encoding
2011-12-18 21:40:14 +01:00
e1ac469cfb
Fix trailing whitespace
2011-12-18 21:40:01 +01:00
d24e8186b4
Merge remote-tracking branch 'chiliproject/master' into unstable
2011-12-18 21:33:05 +01:00
1ebec832af
[ #486 ] More menu items on the wiki annotate view.
2011-12-18 21:21:21 +01:00
44cf67032f
Merge pull request #142 from elm/custom-ldap-filter
...
[#388 ] Custom LDAP filter
2011-12-18 11:13:55 -08:00
b135162c5b
Login should redirect to welcome/home page if already logged in.
2011-12-18 19:49:35 +01:00
81f6635878
Remove debug code. Sorry for that...
2011-12-18 15:58:42 +01:00
0049f82182
Redirect back to where I came from when loggin in via the menu form
2011-12-18 12:28:32 +01:00
58a7182e2d
Use the correct subject id for quoting
2011-12-18 12:04:13 +01:00
2f0d13149d
Copyright header update
2011-12-17 15:50:52 -08:00
3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
34fef9d8fc
Fix display of floatable TOCs in wikis
2011-12-17 22:14:19 +01:00
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
4656cf1c57
Escape raw input if there is a Liquid syntax error
2011-12-17 21:57:01 +01:00
532c9cc55b
Use consistent naming to fix translation in error message
2011-12-13 20:56:43 +01:00
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
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
Eric Davis
Holger Just
Felix Schäfer
Tom Rochette
elm
jwollert
Romano Licker
Moritz Breit