19 Jul, 2012
1 commit
-
Conflicts: app/models/article.rb app/models/profile.rb app/models/uploaded_file.rb public/javascripts/application.js public/stylesheets/application.css test/unit/article_test.rb test/unit/category_finder_test.rb test/unit/enterprise_test.rb
22 Jun, 2012
1 commit
-
Conflicts: test/unit/article_test.rb
21 Jun, 2012
1 commit
-
…into merge-requests/173
17 May, 2012
1 commit
22 Mar, 2012
1 commit
24 Feb, 2012
1 commit
19 Feb, 2012
1 commit
-
Conflicts: app/controllers/application.rb app/controllers/public/browse_controller.rb app/helpers/application_helper.rb app/helpers/display_helper.rb app/models/environment_finder.rb app/models/product.rb app/views/layouts/_javascript.rhtml app/views/layouts/application-ng.rhtml public/javascripts/application.js public/stylesheets/application.css test/functional/browse_controller_test.rb test/functional/search_controller_test.rb vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
27 Jan, 2012
3 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
24 Jan, 2012
1 commit
-
(ActionItem2070)
19 Jan, 2012
1 commit
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
10 Jan, 2012
1 commit
-
When the year is empty, it ends up as 1 in the date object.
24 Dec, 2011
3 commits
-
Share code by placing them together into profile base class
22 Nov, 2011
1 commit
-
This reverts commit 26e7f6658d9d47584be570c1715a032111306316.
14 Nov, 2011
1 commit
-
(ActionItem2070)
01 Nov, 2011
1 commit
-
(ActionItem2104)
11 Oct, 2011
1 commit
-
Libs added * jquery-validation * colorbox * recaptcha (ActionItem2074)
10 Oct, 2011
1 commit
-
* Refactoring profile management to use tokeninput * Also, adding support of tokeninput to the core * Adding attributes validated and cnpj to enterprise * Environment option to define enterprise as validated by defaul * Making profile namedscopes consider subclasses too * Adapting enterprise icon and identification to meet Bsc expectations * Adapting profile info actions to meet Bsc expectations * Adapting control panel buttons to meet Bsc expectations * Adapting core product to meed Bsc expectations * Adding and fixing plugin hotspots (ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)
27 May, 2011
1 commit
-
- Also, adding 'validates_multiparameter_assignments' plugin (ActionItem1951)
28 Mar, 2011
1 commit
-
Thanks to professor Fabio Kon from USP for the heads up. Note that this patch changes only the labels used for the fields, but does not touch the actual field names.
22 Mar, 2011
2 commits
-
* Replacing actions by activities * Removing the more_active logic from profile to organization and person (ActionItem1885)
-
Co-Author: Aurelio A. Heckert <aurelio@colivre.coop.br> * Listing profiles that have 0 objects (friends, actions, etc). * More active based on action instead of articles. * Testing profile in the profile tests instead of communities or people. (ActionItem1885)
27 Jan, 2011
2 commits
-
Reverted Profile.members_of definition Added a members_count method (ActionItem1400)
-
* if he is also last member, the next user to join organization will become admin * if has other members, admin must choose some user to become admin * Generalized enterprise add_member interface. * Using json to manage action after join/leave/add/remove community/friend through ajax. * Person.members_of now returns unique profiles (ActionItem1400)
16 Dec, 2010
1 commit
10 Dec, 2010
1 commit
-
* Added rss-feed-16.png (a 16x16 image of rss feed) * icon_name now is a class method * removing image_tags with article's icons * added icon_for_article on class to display icons (ActionItem1770)
07 Dec, 2010
1 commit
-
(ActionItem1769)
25 Nov, 2010
1 commit
-
(ActionItem1765)
26 Oct, 2010
1 commit
-
(ActionItem1680)
21 Oct, 2010
1 commit
-
Users can delete own profiles Organization admins can delete organizations Environment admins also can remove others profiles (ActionItem1716)
04 Oct, 2010
2 commits
-
(ActionItem1685)
-
(ActionItem1303)
24 Sep, 2010
1 commit
21 Sep, 2010
1 commit
-
* The users member of a community shoudl be notified with the information of where that noficication is. * The friendship relationship should be notified to the both users * If the article is created automaticaly according its template this article should not be notified * The article approval should not notify the article with the user who aproved it as the user that made the article (ActionItem1303)
11 Sep, 2010
1 commit
-
(ActionItem1303)