 Diogo Biazus
|
ba631757bb
|
Merge pull request #710 from diogob/rails_41
Rails 41
|
2014-06-06 10:18:53 -04:00 |
|
|
pedromarins
|
b1071e6fd8
|
fix on projects/edit form to be with the same style as the original form
|
2014-06-06 08:48:20 -03:00 |
|
|
Adriano Benin
|
7a190c8e9c
|
refactor reports sql
|
2014-06-05 20:34:48 -03:00 |
|
|
Diogo Biazus
|
bdbb14b08b
|
Merge pull request #706 from adrianob/more_translation_fixes
more translation fixes
|
2014-06-05 17:56:34 -04:00 |
|
|
Adriano Benin
|
f59362d618
|
fix typo
|
2014-06-05 17:42:13 -03:00 |
|
|
Adriano Benin
|
404100715c
|
more translation fixes
|
2014-06-05 17:12:16 -03:00 |
|
|
Diogo Biazus
|
f2e3821972
|
changed formtastic for simple_form
|
2014-06-05 13:58:45 -04:00 |
|
|
Diogo Biazus
|
c6e623a2c8
|
removed nonexistent images from SASS
|
2014-06-05 13:17:49 -04:00 |
|
|
Diogo Biazus
|
c38f4182c0
|
Merge pull request #704 from pedromarins/privacy-policy
fixing small details on desktop and mobile presentation
|
2014-06-05 10:42:45 -04:00 |
|
|
Diogo Biazus
|
acd88d84d6
|
fixed video handler, now the // comes in the video_embed_url method
|
2014-06-05 09:15:54 -04:00 |
|
|
Diogo Biazus
|
78a7d27b32
|
Fixed has_and_belongs_to_many problem using has_many through instead. We already had an intermediary model.
|
2014-06-04 21:37:12 -04:00 |
|
|
Diogo Biazus
|
ff52b668b0
|
changed .scoped for .all (scoped was removed in rails 4.1)
|
2014-06-04 21:26:48 -04:00 |
|
|
pedromarins
|
56e0ca0665
|
fixing small details on desktop and mobile presentation
|
2014-06-04 16:17:15 -03:00 |
|
|
Antônio Roberto Silva
|
2dfc4b0450
|
Merge pull request #703 from adrianob/channel_order
use same order as projects search for channel projects index
|
2014-06-04 15:27:54 -03:00 |
|
|
Antônio Roberto Silva
|
c5def95cc5
|
Merge pull request #702 from adrianob/translation_fixes
Translation fixes
|
2014-06-04 14:57:03 -03:00 |
|
|
Adriano Benin
|
af43c6b37f
|
use same order as projects search for channel projects index
|
2014-06-04 14:37:53 -03:00 |
|
|
Adriano Benin
|
55bacb770d
|
fix reward translations
|
2014-06-04 14:15:58 -03:00 |
|
|
Adriano Benin
|
154f9b8ce9
|
fix missing translation
|
2014-06-04 13:55:36 -03:00 |
|
|
pedromarins
|
4e32c255e3
|
fix bugs and add list to privacy policy text
|
2014-06-04 12:47:13 -03:00 |
|
|
Diogo Biazus
|
927918e29e
|
Merge pull request #700 from pedromarins/terms-of-use
header mobile menu
|
2014-06-03 11:19:17 -04:00 |
|
|
pedromarins
|
b6791fb926
|
privacy policy page
|
2014-06-03 09:51:13 -03:00 |
|
|
pedromarins
|
d45025345f
|
header mobile menu
|
2014-06-03 09:29:06 -03:00 |
|
|
Diogo Biazus
|
d32aa8e700
|
Merge pull request #698 from devton/fix_payment_method_and_choice_for_mixpanel
Fix payment method and choice for mixpanel
|
2014-06-02 15:54:58 -04:00 |
|
|
Antônio Roberto Silva
|
1496f1ea47
|
use self instead this
|
2014-06-02 17:03:01 -03:00 |
|
|
Antônio Roberto Silva
|
7c9a02095a
|
Merge branch 'master' into new_mailchimp_integration
|
2014-06-02 11:21:48 -03:00 |
|
|
Antônio Roberto Silva
|
6735d22bd8
|
use trackOnPage
|
2014-06-02 10:11:04 -03:00 |
|
|
Diogo Biazus
|
64c810d92e
|
Merge pull request #697 from devton/fix_cpf_blank_on_paypal
When user go to paypal the CPF is a empty string and not a null value [1...
|
2014-05-30 11:04:19 -04:00 |
|
|
Diogo Biazus
|
8bbe8a2442
|
Merge pull request #696 from devton/refact_is_love
refact project_observer to use notify_owner and notify_to_backoffice met...
|
2014-05-30 11:03:31 -04:00 |
|
|
Antônio Roberto Silva
|
81fe9850dc
|
added payment method and choice on contribution show to cath via js on mixpanel track [12549367]
|
2014-05-29 18:53:13 -03:00 |
|
|
Antônio Roberto Silva
|
4b3c8ce9a5
|
Fix ajax to change the payment method name when user change the payment tab
|
2014-05-29 18:52:59 -03:00 |
|
|
Antônio Roberto Silva
|
e855e6f025
|
When user go to paypal the CPF is a empty string and not a null value [12548778]
|
2014-05-29 18:30:27 -03:00 |
|
|
Antônio Roberto Silva
|
39d33824ab
|
refact project_observer to use notify_owner and notify_to_backoffice methods
|
2014-05-29 17:00:42 -03:00 |
|
|
Adriano Benin
|
6ac86c830c
|
use jpeg for thumbnails
|
2014-05-29 16:45:49 -03:00 |
|
|
Antônio Roberto Silva
|
d9e2ea4971
|
added catarse_monkeymail to improve the mailchimp integration
|
2014-05-29 15:56:07 -03:00 |
|
|
pedromarins
|
c998840e5a
|
solving merge conflict on mais.sass
|
2014-05-29 11:30:09 -03:00 |
|
|
pedromarins
|
5fbc3b4abe
|
Terms of use page with design revisions
Missing only the responsive menu on the header
|
2014-05-28 14:17:15 -03:00 |
|
|
Diogo Biazus
|
f670086248
|
Merge pull request #693 from devton/adjust_contribution_user_update
when user don't fill the CPF on contribution like boleto or paypal we us...
|
2014-05-28 12:02:10 -04:00 |
|
|
Antônio Roberto Silva
|
928cef4997
|
when user don't fill the CPF on contribution like boleto or paypal we use the last user address data when update[12548778]
|
2014-05-28 11:35:50 -03:00 |
|
|
pedromarins
|
9991c58483
|
small revisions on terms of use page
|
2014-05-27 18:09:25 -03:00 |
|
|
pedromarins
|
d47a3d8b83
|
extracting text from html to the locale file
|
2014-05-27 17:25:24 -03:00 |
|
|
Diogo Biazus
|
71cc24b003
|
Merge pull request #691 from pedromarins/webflow-css-file
solving conflicts
|
2014-05-27 15:20:12 -04:00 |
|
|
pedromarins
|
3fcd2cc894
|
solving conflicts
|
2014-05-27 15:24:18 -03:00 |
|
|
pedromarins
|
38bbd3ad97
|
terms of use first commit page
|
2014-05-27 15:22:00 -03:00 |
|
|
Antônio Roberto Silva
|
eb4984134f
|
Merge pull request #690 from diogob/remove_by_engage_from_metatags
Changed author meta tag from engage to catarse so that facebook shares w...
|
2014-05-27 15:20:58 -03:00 |
|
|
pedromarins
|
800071a05d
|
creating a separated file for the new bootstrap version based on webflow
|
2014-05-27 15:20:36 -03:00 |
|
|
Diogo Biazus
|
8ea9b16ce1
|
Merge pull request #689 from devton/fix_mixpanel_finished_contribution
use confirmed contribution to send payment methods things and back with ...
|
2014-05-27 14:16:27 -04:00 |
|
|
Diogo Biazus
|
51aae038c7
|
Changed author meta tag from engage to catarse so that facebook shares will be 'by catarse' [12528659]
|
2014-05-27 14:12:41 -04:00 |
|
|
Antônio Roberto Silva
|
255037f8ae
|
use confirmed contribution to send payment methods things and back with the finished contribution to client side because the system skips when payments is made with credit card on mixpanel
|
2014-05-27 14:15:29 -03:00 |
|
|
Diogo Biazus
|
5666c57a90
|
Merge pull request #688 from devton/remove_rewards_papertrail
remove papertrail and log only the last changes in a column on rewards t...
|
2014-05-27 13:13:58 -04:00 |
|
|
Antônio Roberto Silva
|
1d6b36f7b0
|
fix typo error
|
2014-05-27 13:57:22 -03:00 |
|