25 Feb, 2015
7 commits
-
(cherry picked from commit fa7cddb0f79d4bb6d7750ed6fd41bb63446a6012)
-
(cherry picked from commit 23b9a86393b7806070dc36c45d2fe79b96b26eaa)
-
(cherry picked from commit 3600768ceceed5b804b5d208b0df307f9e7b1408)
-
Also removed "id" on update of external_feed_data. It must not be updated or mass-assigned (cherry picked from commit 87a25ade46aa48e9f962f684a2bae334ba0bb504)
-
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)
28 Jan, 2015
4 commits
-
(cherry picked from commit 7441ba6c92304870c6110814fd588718d6e7bde3)
-
There is no much point in hardcoding the expected constant in the test. (cherry picked from commit 89c4127aa558b135e53bb904773303545c231fdf)
-
(cherry picked from commit cd15a410a4673db619f96d52b11ffc293f0a1eba)
-
(cherry picked from commit 83dd0faf85c086defa56b7f2a1bbf5c4dd1f9b59)
11 Dec, 2014
2 commits
08 Dec, 2014
1 commit
04 Dec, 2014
3 commits
02 Dec, 2014
3 commits
-
Check if is template before creating job to check activation
-
Check if is template before removing an inactive user
20 Nov, 2014
1 commit
-
An environment role has permissions for both environment and profile but edition page was displaying only environment permissions.
13 Nov, 2014
2 commits
-
Fix kind method in Role (access_control plugin) Because edit_appearance permission exists for both Environment and Profile roles, the old method returned Environment for a Profile role with this permission. See merge request !374
-
Allow trusted url without protocol for iframe in tinymce See merge request !358
12 Nov, 2014
1 commit
11 Nov, 2014
1 commit
31 Oct, 2014
2 commits
29 Oct, 2014
4 commits
-
*sigh*
-
January first is parsed in UTC, but when the local timezone is applied, those dates end up in the wrong month.
28 Oct, 2014
1 commit
27 Oct, 2014
1 commit
-
Fix 'Report Abuse' action See merge request !343
22 Oct, 2014
4 commits
-
Conflicts: app/helpers/profile_helper.rb app/views/content_viewer/_article_toolbar.rhtml app/views/profile/_common.rhtml app/views/profile/_organization_profile.rhtml app/views/profile/_person_profile.rhtml db/schema.rb public/stylesheets/application.css
20 Oct, 2014
1 commit
14 Oct, 2014
2 commits
-
Total runtime drops from ~21s to ~7s