Commit Graph

3780 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
616e8abe28 Updates foundation rails gem 2016-07-13 14:22:24 +02:00
Juanjo Bazán
cf50b3743c updates travis' script 2016-07-13 12:06:12 +02:00
Juanjo Bazán
1b5f7a0e6e rails up! 2016-07-13 11:48:59 +02:00
Alberto Garcia Cabeza
62a7b32389 Adds texts to icons on comments votes 2016-07-12 13:55:52 +02:00
Alberto Garcia Cabeza
77b99c1b5c Adds text to icons like and unlike on debates 2016-07-12 13:48:55 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Juanjo Bazán
f91385873a updates ruby version in deploy.rb to 2.3.1 2016-07-12 11:21:15 +02:00
Raimond Garcia
7ed6594793 Merge pull request #1156 from consul/ruby-up-to-latest
updates ruby version to 2.3.1
2016-07-12 11:11:18 +02:00
Juanjo Bazán
575d9a1998 updates capistrano 2016-07-11 14:21:54 +02:00
Juanjo Bazán
631dd50856 updates deprecated require in Capfile 2016-07-11 14:21:41 +02:00
Juanjo Bazán
511d223612 updates dependencies
coffee-rails, foundation_rails_helper
2016-07-11 12:53:09 +02:00
Juanjo Bazán
fd157c6230 updates dependencies 2016-07-11 12:23:11 +02:00
Juanjo Bazán
23ff4d2203 updates development dependencies 2016-07-11 11:09:10 +02:00
Juanjo Bazán
6b351de6a1 fixes build 2016-07-11 10:43:27 +02:00
Juanjo Bazán
8316d9d895 fixes spec 2016-07-10 23:24:42 +02:00
Juanjo Bazán
c147ea227b updates dependencies 2016-07-10 23:24:02 +02:00
Raimond Garcia
50cbce2283 Merge pull request #1179 from consul/setting-helper
makes sure setting helper is used in views
2016-07-08 15:09:53 +02:00
Juanjo Bazán
14a8bc1c53 Merge pull request #1171 from consul/update-gemfile
Updates Gemfile
2016-07-08 15:02:55 +02:00
Juanjo Bazán
7f01dbdca2 makes sure setting helper is used in views 2016-07-08 14:42:28 +02:00
Alberto Garcia Cabeza
e55fdc42ee Updates classes names for social share button 2016-07-08 14:13:13 +02:00
Alberto Garcia Cabeza
811dcc20b2 Updates Gemfile 2016-07-08 10:50:55 +02:00
Juanjo Bazán
37fc96f884 Merge pull request #1168 from consul/remove-madrid
Remove madrid references on code
2016-07-06 17:01:53 +02:00
Alberto Garcia Cabeza
67f07ba73a Fixes typo 2016-07-06 14:48:51 +02:00
Alberto Garcia Cabeza
b4f2e4f3c6 Merge branch 'remove-madrid' of github.com:consul/consul into remove-madrid 2016-07-06 14:48:24 +02:00
Alberto Garcia Cabeza
702cfe13d1 Fixes specs 2016-07-06 14:47:09 +02:00
Alberto Garcia Cabeza
edd8883deb Fixes specs 2016-07-06 13:43:05 +02:00
Alberto Garcia Cabeza
219f4e2c15 Deletes sitemap 2016-07-06 12:32:14 +02:00
Alberto Garcia Cabeza
d24efbad60 Changes .com urls examples to .consul 2016-07-06 12:32:07 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
ece2f6f019 Removes Madrid references on pages 2016-07-04 18:07:45 +02:00
Alberto Garcia Cabeza
22e1b533bc Removes Madrid from translations 2016-07-04 18:06:51 +02:00
Raimond Garcia
aab890c006 Merge pull request #1167 from consul/invitation-emails
Invitations polish
2016-06-29 22:04:20 +02:00
rgarcia
96630f88f2 takes into account emails separated by commas without spaces 2016-06-29 21:46:03 +02:00
Juanjo Bazán
47a6480652 updates monitoring dependencies 2016-06-28 21:30:22 +02:00
Juanjo Bazán
9e55d4f719 updates nokogiri (security update) 2016-06-28 21:28:21 +02:00
Enrique García
c899f4da19 Merge pull request #1166 from consul/management-invitations
Management invitations
2016-06-28 13:12:46 +02:00
rgarcia
ad1720ba02 uses applications's default locale 2016-06-27 23:38:23 +02:00
rgarcia
745de9bb77 sends invitation email to users 2016-06-27 23:37:58 +02:00
Alberto Garcia Cabeza
0bb948a013 Updates mailer texts 2016-06-27 16:01:03 +02:00
Alberto Garcia Cabeza
a2a2960867 Adds mailer template for user invites 2016-06-27 15:37:45 +02:00
Alberto Garcia Cabeza
947b2bcb0d Adds user invites views on management 2016-06-27 14:25:20 +02:00
kikito
73d3d0c8c3 hides the retire proposal link for admins in User#show 2016-06-23 17:48:30 +02:00
Juanjo Bazán
577a7435a9 Merge pull request #1163 from consul/ie-improvements
Creates new scss file for IE styles
2016-06-23 14:33:24 +02:00
Alberto Garcia Cabeza
0972f5284a Creates new scss file for IE styles 2016-06-23 13:56:57 +02:00
Juanjo Bazán
0320abe1cf Merge pull request #1161 from consul/ie-message-alert
Changes message for ie alert
2016-06-22 13:53:44 +02:00
Alberto Garcia Cabeza
e01162bc7a Changes message for ie alert 2016-06-22 11:17:27 +02:00
Enrique García
dc849a6103 Merge pull request #1159 from consul/official_positions
Official position badges
2016-06-21 12:08:15 +02:00
rgarcia
1f7e86e206 fixes specs 2016-06-20 22:06:49 +02:00
rgarcia
00dbbd0689 fixes specs (unauthenticated users can view spending proposal show) 2016-06-20 21:54:45 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00