Felix Schäfer
ec4b42f24f
Bump rails to 2.3.14 #584
2011-08-22 22:07:38 +02:00
Felix Schäfer
9dae76d564
This should fix it once and for all… #517
...
(Sorry for the commit-noise)
2011-08-21 23:36:03 +02:00
Felix Schäfer
d8ce7564ce
So let's try to hit all "ruby 1.8"s the hard way.
2011-08-21 23:12:21 +02:00
Felix Schäfer
57ecf525f0
Merge pull request #100 from thegcat/feature/517-put_faster_csv_in_the_gemfile
...
Rip faster_csv out of lib into the Gemfile. #517
2011-08-21 10:58:00 -07:00
Felix Schäfer
0b57e936f5
Rip faster_csv out of lib into the Gemfile. #517
2011-08-21 19:26:43 +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
Holger Just
eae5c9af68
[ #275 ] Use ChiliProject::VERSION for new code
2011-08-21 15:16:34 +02:00
Holger Just
5300120461
Move Redmine::VERSION to ChiliProject::VERSION and add a compatibility interface
2011-08-21 14:48:53 +02:00
Holger Just
1796fddd2b
[ #275 ] Add requires_chiliproject. We now use the rubygems dependency syntax.
2011-08-21 14:47:31 +02:00
Felix Schäfer
8f4439e0d4
Fix issue pdf export #561
...
The pdf export tried to export the initial journal, which it shouldn't.
2011-08-21 12:56:27 +02:00
Felix Schäfer
9e12deda97
Merge pull request #97 from finnlabs/pulls/577/invalid-watcher-user-fix
...
Invalid watcher user error when adding an invalid user as watcher #577
2011-08-21 03:51:39 -07:00
Jean-Philippe Lang
5d7bc5c94c
[ #577 ] Avoid validating users when creating watcher relation
...
Taken from Redmine r5880
Committed by Jean Philippe Lang
2011-08-15 16:05:37 +02: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
27fd103132
[ #263 ] Override some defaults in the sap theme
2011-08-05 12:12:39 -07:00
Eric Davis
a9d6518a5d
[ #263 ] Set up default styles
2011-08-05 12:09:16 -07:00
Eric Davis
d8023e6949
[ #263 ] Remove duplicated favicon
2011-08-05 11:36:55 -07:00
Eric Davis
667f85f9a5
[ #263 ] Extract custom S&P images
2011-08-05 11:35:05 -07:00
Eric Davis
7f06e7394c
[ #263 ] Update SAP theme
2011-08-05 11:32:21 -07:00
Eric Davis
d94f7f7f9b
[ #263 ] Remove old themes
2011-08-05 11:29:13 -07:00
Eric Davis
949d229629
[ #263 ] Extract custom colors to color.css
2011-08-05 11:21:29 -07:00
Eric Davis
ccad72ba85
[ #263 ] Move the fugue images into the main images/ directory
2011-08-05 10:50:08 -07:00
Eric Davis
4b8f4c3b83
[ #263 ] Allow setting the page header title
2011-08-05 10:45:48 -07:00
Eric Davis
d63cb35e82
[ #263 ] Add icons to the main menu
2011-08-05 10:41:29 -07:00
Eric Davis
cfed74579d
[ #263 ] Cleaning up admin menus
2011-08-05 10:22:54 -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
adffd044d7
[ #263 ] Fix the missing line on the top menu
2011-08-05 09:05: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
aed0a6d5c3
Merge branch 'stable' into unstable
2011-08-01 16:57:22 -07:00
Eric Davis
eded447079
Merge branch 'stable'
2011-08-01 16:56:59 -07:00
Eric Davis
3dc373eea4
Merge branch 'release-v2.1.1' into stable
2011-08-01 16:53:13 -07:00
Eric Davis
da9c4a16a9
Bump version to 2.1.1
2011-08-01 16:52:33 -07:00
Eric Davis
46ba84ead2
Update Changelog for 2.1.1
2011-08-01 16:13:52 -07:00
Eric Davis
8b99047123
Merge branch 'stable'
2011-08-01 16:12:23 -07: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
bf13b0f409
Check for journal_user, then updated_by, and finally User.current when creating Journals
2011-07-30 21:51:26 -07:00
Eric Davis
68526f6f2d
Clear @extra_journal_attributes also after saving a Journal
2011-07-30 21:50:47 -07: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
Eric Davis
124c98d4ba
[ #263 ] Fix for changes to the admin_menu
2011-07-29 15:06:09 -07:00