13 Jul, 2015
1 commit
03 Feb, 2015
1 commit
-
Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb
15 Jan, 2015
1 commit
-
I have deduplicated every message in plugin code that was already in the core. Going forward, plugins should use c_() is they want to reuse the message from the core. If they want to force their own translation, they should probably use _('plugin_name|The message') to avoid overriding translations from the core.
20 Nov, 2014
1 commit
-
Conflicts: Gemfile.lock script/development
30 Sep, 2014
1 commit
-
fixes #11
13 Aug, 2014
1 commit
04 Aug, 2014
1 commit
-
(ActionItem3234)
27 Jun, 2014
2 commits
14 Jun, 2014
1 commit
-
(ActionItem2859)
11 Jun, 2014
1 commit
-
Conflicts: app/models/environment.rb
05 Jun, 2014
5 commits
-
(ActionItem2859)
-
(ActionItem2859)
-
(ActionItem2859)
-
Conflicts: app/controllers/admin/environment_design_controller.rb app/models/friends_block.rb app/models/members_block.rb test/functional/environment_design_controller_test.rb test/unit/members_block_test.rb
02 Jun, 2014
3 commits
-
Conflicts: lib/api/v1/users.rb
29 May, 2014
3 commits
26 May, 2014
2 commits
23 May, 2014
3 commits
-
Conflicts: script/sample-articles script/sample-enterprises script/sample-products script/sample-profiles
21 May, 2014
1 commit
-
Conflicts: lib/api/helpers.rb lib/api/v1/articles.rb lib/api/v1/users.rb
19 May, 2014
1 commit
18 May, 2014
4 commits
16 May, 2014
4 commits
-
Conflicts: app/models/article.rb app/models/user.rb config.ru
-
This reverts commit 43562836cd08189cd2a88838db6c6cc8f559ab16.
15 May, 2014
3 commits