17 Mar, 2015
1 commit
16 Mar, 2015
3 commits
-
(cherry picked from commit 0b9f2d0d4c364c71b56c0a74a44b4bb6dd20976e)
-
Conflicts: app/views/cms/_upload_file.html.erb public/javascripts/application.js (cherry picked from commit f3577c1b29363d9b8de8aa9e4b853518ceb0dd76)
-
Added the missing character to identify form (cherry picked from commit 5b7b8e5273a8ef165d8dba64e500832583da4835)
27 Feb, 2015
1 commit
25 Feb, 2015
14 commits
-
(cherry picked from commit dcc12e37c6767d6d5c44040d3d9d620f7b64292f)
-
(cherry picked from commit 51dc531e5958e9824b70fb4978e4857b3422ae35)
-
(cherry picked from commit fa7cddb0f79d4bb6d7750ed6fd41bb63446a6012)
-
(cherry picked from commit 23b9a86393b7806070dc36c45d2fe79b96b26eaa)
-
(cherry picked from commit e51453fd3b20c01ed6b77b2c4396ec4254fbd403)
-
(cherry picked from commit 3600768ceceed5b804b5d208b0df307f9e7b1408)
-
Also: - fix to avoid crash if there is some answer without a related field (cherry picked from commit 6fcf788e02ff6731733cb3bc6abb5dba63fa0ac9)
-
Also fixes a mass assignment error in membership task and removes a redundant `attr_accessible` in TextField since it was already set in Field. (cherry picked from commit 05db3adf7a68cc4a307726913bf5591a6f154411)
-
Also removed "id" on update of external_feed_data. It must not be updated or mass-assigned (cherry picked from commit 87a25ade46aa48e9f962f684a2bae334ba0bb504)
-
(cherry picked from commit 0484736d982f3beb877cf35e508712440cbb62e1)
-
(cherry picked from commit e47daca26c5861d09c8248855472d4e65cbda1d0)
-
The PluginAdminController protect by default users that didn't have edit_environment_features permission against access plugin administration. (cherry picked from commit 7c541b4a2fef9c201c164a05f1519b190f667a5f)
-
(cherry picked from commit 05e56cd31341a2c42a4d1fda2cd1a4f2c94c5f1a)
-
On environments created before including =spam_comments_count=, the visualization of number of comments was crashing because it was nil Fixes #31 (cherry picked from commit 6c59ac4a8cfd8089927917718a312493c77a578a)
07 Feb, 2015
2 commits
-
Patch for commits: da3b4c3f71f0197b50524e2a617b547087251c67 ece6c5630ff06d35f466c7fc0cdbb2296a23c587 b6108f3c8d9033375aaa5c5fce0d71bc839dad21 See merge request !376
28 Jan, 2015
15 commits
-
(cherry picked from commit 7441ba6c92304870c6110814fd588718d6e7bde3)
-
This actually breaks things. See the discussion on !430 https://gitlab.com/noosfero/noosfero/merge_requests/430 (cherry picked from commit 4c229767b8864713d545ee96e09844b829afd321)
-
When acessing Noosfero through a properly configured HTTPS setup, all links will now be generated with https (or without an explicit protocol and will just work). Links generated outside of the scope of a request (models, mailers etc) will still use http://. That can be fixed by a localized change to Environment#top_url, but for now I expect everyone using HTTPS to have a proper HTTP -> HTTPS redirection mechanism. (cherry picked from commit d9c3be28655e69d77a0f9aeba6a3a50da24eea4f)
-
Rails needs that header to know that the whole system is actually being accessed via HTTPS (cherry picked from commit 4119cb4530d778f3dd8eafd8e832e87735d4e265)
-
(cherry picked from commit 3a38934e6417baca9c1b35698645fbb7b98ff91e)
-
There is no much point in hardcoding the expected constant in the test. (cherry picked from commit 89c4127aa558b135e53bb904773303545c231fdf)
-
AI:3006 (cherry picked from commit e1f69da2a81047db67d8d9a9d5abb951238db9e2)
-
Use class name as string instead of constant (cherry picked from commit dbc6d527b78d736cf114e52109335e280aca4809)
-
Escapes html so the javascript doesn't break (cherry picked from commit 76f856ad49aa96224aaa646d49351c98be74f12a)
-
(cherry picked from commit cd15a410a4673db619f96d52b11ffc293f0a1eba)
-
(cherry picked from commit 83dd0faf85c086defa56b7f2a1bbf5c4dd1f9b59)
-
(cherry picked from commit daa42a638a380eb7fc7b6422662a47ea6ca77a8d)
-
(cherry picked from commit 585963ae1f48474605aa7f991a63d3a9d16bb1d4)
14 Jan, 2015
4 commits
-
When upgrading from 0.47, 20140724134601_fix_yaml_encoding.rb will run before 20140827191326_remove_environment_statistics_block.rb and crash because the EnvironmentStatisticsBlock class does not exist anymore.