kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,262 Commits 5 Branches 46 Tags
Commit Graph

885 Commits

Author SHA1 Message Date
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
4577e54f04 Fix trailing whitespace 2012-01-03 20:43:08 +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
e4554a6d7b [#792] Fix tests from merge 2011-12-29 11:50:48 -08:00
Eric Davis
00df832126 Merge branch 'ticket/unstable/792-confirmation-emails' into unstable 2011-12-29 10:28:47 -08:00
Eric Davis
8100ce0ce5 Optimize: Remove per-language assertions for Mailer tests 
I can't find any real reason they are needed at all and were taking
a lot of time to run. Results for the test class

Before: 56 seconds
After: 23 seconds
 2011-12-28 12:20:45 -08:00
Eric Davis
3df729e47d Replace puts and !!! messages with pending tests when the test SCMs are missing 2011-12-27 18:23:14 -08:00
Eric Davis
04db42f537 Fix another broken test that can't run by itself due to missing fixtures 2011-12-27 17:38:38 -08:00
Eric Davis
e6e6a06fff [#802] Allow Groups to be added as a Watcher 2011-12-27 17:38:20 -08:00
Eric Davis
111c7f47f7 [#800 #801] Test that non-member watchers aren't removed if they still have access 2011-12-27 17:08:48 -08:00
Eric Davis
3af5544dbc [LSS#4190] Add watching to documents 2011-12-27 13:16:52 -08:00
Eric Davis
72eadcc6ea [#796] Adds date range filter. 
Based on r6226 from Redmine by Jean-Philippe Lang
 2011-12-27 13:02:46 -08:00
Eric Davis
dc541597ec [#792] Send email from mail_handler for emails which are missing required information 2011-12-26 17:39:29 -08:00
Eric Davis
1dd07471ca [#792] Send email from mail_handler for emails missing a project 2011-12-26 17:38:26 -08:00
Eric Davis
4ff670f5fa [#792] Send email from mail_handler for unauthorized actions 2011-12-26 17:38:25 -08:00
Eric Davis
9f4683d71b [#792] Send email when mail_handler gets an email from an unknown user 2011-12-26 17:38:25 -08:00
Eric Davis
331ecb4c4f [#792] Add confirmation emails for successful forum replies 2011-12-26 17:38:25 -08:00
Eric Davis
7c7aca4f0c [#792] Add confirmation emails for successful issue replies 2011-12-26 17:38:25 -08:00
Eric Davis
d53c4e9aae [#792] Add confirmation emails for successful issue creation 2011-12-26 17:38:24 -08:00
Eric Davis
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
Holger Just
745f889e92 Enforce UTF-8 source encoding 2011-12-18 21:40:14 +01:00
Holger Just
e1ac469cfb Fix trailing whitespace 2011-12-18 21:40:01 +01:00
Holger Just
d24e8186b4 Merge remote-tracking branch 'chiliproject/master' into unstable 2011-12-18 21:33:05 +01:00
Eric Davis
2f0d13149d Copyright header update 2011-12-17 15:50:52 -08:00
Eric Davis
3a16f3f5b1 Merge remote-tracking branch 'upstream/master' into unstable 2011-12-17 15:20:58 -08:00
Holger Just
4656cf1c57 Escape raw input if there is a Liquid syntax error 2011-12-17 21:57:01 +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
ee48a8da4f Merge branch 'ticket/unstable/692-final-design' into unstable 2011-12-10 10:40:09 -08:00
Eric Davis
971277b507 [#692] Fix failing test due to design changes 2011-12-09 18:06:19 -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
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
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
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
a31a4a8852 [#604] Adapt fixtures for new liquid syntax 2011-11-20 02:49:22 +01:00
Eric Davis
dedf696666 [#604] Add missing test for Liquid 2011-11-20 02:49:22 +01:00
Holger Just
464dafc1e7 [#604] We don't support the old escape style anymore 2011-11-20 02:49:22 +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
Gregor Schmidt
fb7f109ac6 [#708] Adding tests exposing the erroneous behavior 2011-11-17 11:17:11 +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
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
a911d83889 [#263] Fix theme tests that changed singleton data 2011-11-06 16:39:28 -08:00
Eric Davis
b160217299 Use full paths to test_helper.rb for metric_fu/rcov to pick up 2011-11-03 19:43:20 -07:00
Holger Just
cb2086f652 [#647] Fix XSS in textile image syntax. 
Image URLs are not properly escaped in the bundled RedCloth3 library.
It thus allowed an XSS vector.

The patch was adapted from r7570 from Redmine by Etiene Massip. See also
http://www.redmine.org/issues/9245.
 2011-10-31 17:22:34 +01:00
Holger Just
91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Kornelius Kalnbach
aa8237c546 fix application_helper_test 2011-10-29 13:44:47 +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