26 Aug, 2015
1 commit
10 Aug, 2015
3 commits
-
Move icon to the icon theme structure (awesome also have an icon for this)
09 Aug, 2015
1 commit
31 Jul, 2015
2 commits
11 Jun, 2015
1 commit
-
- Refactoring CSS to better display folder itens - Creating method to display uploaded file names with extension in upper case Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
19 May, 2015
1 commit
13 Feb, 2015
1 commit
-
See merge request !454
10 Feb, 2015
1 commit
-
awesome: Update to version 4.3.0 and make update process easier For update just replace the `scss` and `fonts` folder with the new version, no merge is necessary as before. See merge request !461
09 Feb, 2015
1 commit
-
We now extend the vanilla scss and extend on another file. Conflicts: public/designs/icons/awesome/style.css
06 Feb, 2015
1 commit
-
Conflicts: public/stylesheets/application.css
03 Feb, 2015
2 commits
-
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
27 Jan, 2015
1 commit
-
Conflicts: public/javascripts/application.js public/stylesheets/application.css
22 Jan, 2015
1 commit
16 Jan, 2015
1 commit
20 Nov, 2014
1 commit
-
Conflicts: Gemfile.lock script/development
10 Oct, 2014
1 commit
-
- Remove absolute URL's from stylesheets and javascripts - Handle prefix in LinkListBlock - add Noosfero.root method as a central data source The application server needs to be started with the RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix. In development, this can be tested with # assuming /social prefix $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start For production, see INSTALL.md
29 Jul, 2014
1 commit
22 Jul, 2014
1 commit
12 May, 2014
1 commit
-
Conflicts: features/categories_block.feature public/stylesheets/application.css
02 Apr, 2014
2 commits
-
…to juniorsilva1001/noosfero-article-version Conflicts: app/views/content_viewer/versioned_article.rhtml db/schema.rb public/stylesheets/application.css
28 Mar, 2014
1 commit
-
and warnings. AI2822
07 Mar, 2014
2 commits
23 Jan, 2014
2 commits
-
Conflicts: public/stylesheets/application.css
21 Jan, 2014
1 commit
-
…into merge-requests/339 Conflicts: app/models/block.rb public/designs/icons/tango/style.css test/unit/block_test.rb
18 Jan, 2014
1 commit
12 Dec, 2013
1 commit
-
…into merge-requests/410
20 Nov, 2013
1 commit
19 Nov, 2013
1 commit
08 Nov, 2013
1 commit
-
Allow admins to activate and deactivate environment users.
04 Jul, 2013
1 commit
09 May, 2013
1 commit
08 May, 2013
1 commit
-
The idea is never to give a Upload File to a view. That must always work with a File Presenter providing overwrite methods and specific views/partials. ActionItem2373
21 Aug, 2012
1 commit