Software Público Brasileiro

03 Nov, 2014

40 commits

• 184f587b   Merge branch 'noosfero-integration' into 'master' ... Browse Code »

  Noosfero integration
  
  This integrates Colab/Noosfero apps in means of CSS/JS.
  Tasks accomplished whithin this merge:
  1. Added noosfero proxy as a Django app
  2. Remake of Colab navbar and footer

  Sergio Oliveira

  2014-11-03 13:04:55 -0500  
• 4099cdae   Removed declaration of jQuery.noConflict() ... Browse Code »

  This was already set by Noosfero

  Sergio Oliveira

  2014-11-03 16:03:27 -0200  
• cdd7ecfa   Changed css to use colab's BS icons Browse Code »
  Charles Oliveira

  2014-11-03 15:30:57 -0200  
• 71548274   Dropped /static/converse.js/converse.min.css to fix image upload Browse Code »
  macartur

  2014-11-03 15:10:11 -0200  
• c8b1f3b1   Merge branch 'noosfero-integration' of beta.softwarepublico.gov.br:softwarepubli… ... Browse Code »

  …co/colab into noosfero-integration
  
  Conflicts:
  	colab/proxy/noosfero/views.py

  Charles Oliveira

  2014-11-03 15:07:23 -0200  
• a9dd3323   Dropped noosfero's user id tag Browse Code »
  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 7454e69f   Added subfolder for css and js Browse Code »
  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 54a7ba88   Moved static files to noosfero static folder Browse Code »
  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 51fe84b3   Added some info about the css generation Browse Code »
  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• ac5772af   Removed tmp static tests Browse Code »
  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 3035ace7   Adding url dispatcher for noosfero ... Browse Code »

  Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• aa7702de   Adding only relative url dispatching for gitlab ... Browse Code »

  Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• cdfb254d   Adding only relative url dispatching for noosfero ... Browse Code »

  Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• b67288b5   Added some more space to fit noosfero pop ups ... Browse Code »

  Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 431f0dcc   Fixed noosfero menu bar ... Browse Code »

  Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 8b06a83c   Minor div class: '.colab-style' to 'colab-style' ... Browse Code »

  Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

  Charles Oliveira

  2014-11-03 14:59:01 -0200  
• 830b7f40   Added diazo rules to remove default css and js Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 720f682b   Moved js includes to footer_js Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• db75faa5   Wrapped navbar and footer Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• becac86a   Added necessary js to colab's navbar dropdown and responsiviness Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 6911112d   Added only css necessary to colab's navbar Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• a1b51851   Finished dirty work colab bar for noosfero proxy Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 4ae53674   Attempting for new Colab menu bar Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 45214e25   Returned noosfero urls on base.html Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• eb82403e   Applied new proxy structure Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 834f99e3   Removed awesome-fonts.css Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• bf7e4b4d   Removed noosfero header and footer Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 619e6521   Initial noosfero integration, needs lots of improvements Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• ac81fe69   Fixed gitlab wiki page creation Browse Code »
  Charles Oliveira

  2014-11-03 14:59:00 -0200  
• 72c77ff5   Fixed workarounds for .hide elements Browse Code »
  Charles Oliveira

  2014-11-03 14:58:59 -0200  
• 988be0a3   Added workaround for adding group members Browse Code »
  Charles Oliveira

  2014-11-03 14:58:59 -0200  
• 549947f6   Disabling rails black magic (TurboLinks) Browse Code »
  Sergio Oliveira

  2014-11-03 14:58:59 -0200  
• ca28fda0   Removed old scripts Browse Code »
  Sergio Oliveira

  2014-11-03 14:58:59 -0200  
• 7c71f889   Fixed danger settings for gitlab projects Browse Code »
  Charles Oliveira

  2014-11-03 14:58:59 -0200  
• 7b603be6   Fixed login button while in gitlab pages Browse Code »
  Charles Oliveira

  2014-11-03 14:58:59 -0200  
• d5c1f5d7   Fixed notification ssh-key Browse Code »
  macartur

  2014-11-03 14:58:59 -0200  
• 37ebcf49   Revert "Fixed notification ssh-key" ... Browse Code »

  This reverts commit 2b473572fc1c753abe0fb0aaef537f01983fc294.

  macartur

  2014-11-03 14:58:59 -0200  
• 5e928247   Fixed notification ssh-key Browse Code »
  macartur

  2014-11-03 14:58:59 -0200  
• 3afe5463   Fixed typo Browse Code »
  Sergio Oliveira

  2014-11-03 14:58:59 -0200  
• 68df9bd6   Preventing Gitlab to break header and footer links Browse Code »
  Sergio Oliveira

  2014-11-03 14:58:59 -0200