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 |
|
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 |
|
Eric Davis
|
8c183dda2e
|
[#263] Fix XSS regression from merge
|
2011-07-29 15:04:22 -07:00 |
|
Eric Davis
|
e7e4557009
|
[#263] Fix journal formatting
|
2011-07-29 15:04:03 -07:00 |
|
Eric Davis
|
5cedd5cdcb
|
[#263] Don't output heads_for_wiki_formatter
|
2011-07-29 14:46:39 -07:00 |
|
Eric Davis
|
cf40447356
|
Fix the thickbox loading image path
|
2011-07-29 14:43:33 -07:00 |
|
Eric Davis
|
61847d831a
|
CSS cleanup for the sidebar
|
2011-07-29 14:43:33 -07:00 |
|
Eric Davis
|
6c9c85134a
|
Fix the issue action bar CSS
|
2011-07-29 14:43:33 -07:00 |
|
Eric Davis
|
6435905132
|
Port issue show view
|
2011-07-29 14:43:33 -07:00 |
|
Eric Davis
|
ce973429fe
|
Move the Add link next to the Related issues label
|
2011-07-29 14:37:24 -07:00 |
|
Eric Davis
|
cff91d8cf0
|
Port id selectors to the main issues list
|
2011-07-29 14:37:24 -07:00 |
|
Eric Davis
|
13f57032c1
|
Add the new issue button partial
|
2011-07-29 14:37:24 -07:00 |
|
Eric Davis
|
7485858da2
|
Cleanup styles in the issue filter section
|
2011-07-29 14:37:24 -07:00 |
|
Eric Davis
|
2dc0e100c3
|
Port the issue filter section on the issues list
|
2011-07-29 14:37:24 -07:00 |
|
Eric Davis
|
5949f8de91
|
Port issue history changes
|
2011-07-29 14:37:24 -07:00 |
|
Eric Davis
|
ec21b4c075
|
Merge issue context menu changes
|
2011-07-29 14:32:53 -07:00 |
|
Eric Davis
|
84ef979c47
|
Add welcome text to the project list
|
2011-07-29 14:31:27 -07:00 |
|
Eric Davis
|
6d522a9acd
|
Remove the list of versions from sidebar, will be moved to menu
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
48675d63a5
|
Clean up footer
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
bfa57e5e6c
|
Fix hardcoded image path
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
ac48b91864
|
Add images
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
d3392c6d0d
|
Add JavaScript
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
a0c777ee79
|
Add the CSS, including resets
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
c23f73e9fe
|
Port ApplicationHelper patches
|
2011-07-29 14:31:26 -07:00 |
|
Eric Davis
|
484ed29fa2
|
Port main layout
|
2011-07-29 14:29:23 -07:00 |
|
Eric Davis
|
1f57eb01b1
|
Merge HTML head section
|
2011-07-29 14:25:35 -07:00 |
|
Eric Davis
|
74cfd7b5ca
|
Merge branch 'stable' into unstable
|
2011-07-29 13:54:27 -07:00 |
|
Eric Davis
|
30285ce67f
|
Merge branch 'release-v2.1.0' into stable
|
2011-07-29 10:47:59 -07:00 |
|
Eric Davis
|
2d67c2f2b3
|
Bump version to 2.1.0
|
2011-07-29 10:29:52 -07:00 |
|
Eric Davis
|
1af4c30a6c
|
Update changelog for 2.1.0 release
|
2011-07-29 10:29:00 -07:00 |
|
Eric Davis
|
70c3e1c8f9
|
[#544] html_escape issue fields
|
2011-07-29 09:25:13 -07:00 |
Felix Schäfer
|
4bc5bc9fa6
|
Avoid touching journaled objects on backdated journal creation.
|
2011-07-29 18:21:04 +02:00 |
|
Felix Schäfer
|
5015ca4878
|
Merge branch 'master' of github.com:chiliproject/chiliproject
|
2011-07-29 18:19:46 +02:00 |