Juanjo Bazán
|
91199cda77
|
removes capybara warning messages
|
2016-04-25 11:44:33 +02:00 |
|
Juanjo Bazán
|
32f971f0ad
|
Merge pull request #1084 from consul/spending-proposals-summary
Spending proposals admin summary
|
2016-04-25 11:29:07 +02:00 |
|
Alberto Garcia Cabeza
|
a45e112e65
|
Adds styles to admin spending proposals summary
|
2016-04-25 11:12:52 +02:00 |
|
Juanjo Bazán
|
a49624b6ad
|
adds social settings to dev_seeds
|
2016-04-24 21:56:43 +02:00 |
|
Alberto Garcia Cabeza
|
f079bdac8a
|
Improves styles for retire proposals
|
2016-04-23 13:28:43 +02:00 |
|
Juanjo Bazán
|
5b4a7b8cf8
|
adds link to explanation
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
ed0a4a8525
|
adds links to filter retired proposals by reason
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
d63cf8b392
|
removes retired proposals from default index
adds a sidebar link to retired proposals list
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
58a5e2a283
|
authors can retire proposals now
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
be011a10dc
|
adds retired reason & explanation to proposals
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
f36f0ca8c8
|
adds scope & boolean method for retired proposals
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
69d2c14b49
|
adds retired_at to proposals
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
a8bc3095b4
|
improves activity styles
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
e3bbce5bd4
|
fixes wrong i18n key
|
2016-04-23 13:23:47 +02:00 |
|
rgarcia
|
13f65b6b71
|
cleans up
|
2016-04-22 15:03:50 +02:00 |
|
rgarcia
|
bdc815e05c
|
adds specs
|
2016-04-22 15:03:50 +02:00 |
|
rgarcia
|
6a4177ed59
|
updates dev seeds
|
2016-04-22 15:03:50 +02:00 |
|
rgarcia
|
44528c4a32
|
adds translations
|
2016-04-22 15:03:50 +02:00 |
|
rgarcia
|
de84480788
|
adds admin summary page for spending proposals
|
2016-04-22 15:03:46 +02:00 |
|
Enrique García
|
2f1b84f565
|
Merge pull request #1082 from consul/valuator-validation
adds validation on feasible_explanation
|
2016-04-21 16:48:43 +02:00 |
|
Raimond Garcia
|
f98c821176
|
Merge pull request #1083 from consul/custom-styles
Custom styles
|
2016-04-21 16:07:32 +02:00 |
|
rgarcia
|
8a1d1986f2
|
fixes specs
|
2016-04-21 15:50:47 +02:00 |
|
rgarcia
|
521172bc19
|
adds validation on feasible_explanation
|
2016-04-21 14:07:41 +02:00 |
|
Alberto Garcia Cabeza
|
aaeb710118
|
Adds custom.css file
|
2016-04-21 14:06:12 +02:00 |
|
Alberto Garcia Cabeza
|
08a17f3b0e
|
Makes generic logos and avatars, and removes unused images
|
2016-04-21 14:05:30 +02:00 |
|
Alberto Garcia Cabeza
|
a636ddeb83
|
Removes test page
|
2016-04-21 14:03:42 +02:00 |
|
Juanjo Bazán
|
54c1c581f9
|
uses index_customization in debates_controller
|
2016-04-21 12:00:48 +02:00 |
|
Alberto García Cabeza
|
da79306cd6
|
Merge pull request #1079 from MaiteHdezRivas/select-featured-debates
Select featured debates
|
2016-04-21 11:54:18 +02:00 |
|
MaiteHdezRivas
|
c86f3516db
|
correct text in the test
|
2016-04-21 11:30:45 +02:00 |
|
MaiteHdezRivas
|
f771a61a50
|
Refactoring method on debates controller
|
2016-04-21 11:13:58 +02:00 |
|
Juanjo Bazán
|
f3aafcb29e
|
Merge pull request #1080 from consul/collapse-comments
Collapse comments
|
2016-04-20 17:49:09 +02:00 |
|
Alberto Garcia Cabeza
|
e3878ff437
|
Fixes icon animation on reply comments
|
2016-04-20 17:27:58 +02:00 |
|
MaiteHdezRivas
|
3e7db9d1b5
|
Best practices code changes
|
2016-04-20 16:40:58 +02:00 |
|
Alberto Garcia Cabeza
|
6a26bfd928
|
Updates icons font
|
2016-04-20 15:57:07 +02:00 |
|
Juanjo Bazán
|
6a08a8d574
|
Merge pull request #933 from palomahnhp/tracking_user_verifications_and_others
Tracking user verifications and supports proposals #571
|
2016-04-20 12:16:29 +02:00 |
|
palomahnhp
|
bf5d253e12
|
Merge branch 'master' into tracking_user_verifications_and_others
Conflicts:
app/controllers/admin/stats_controller.rb
db/dev_seeds.rb
|
2016-04-20 11:44:33 +02:00 |
|
palomahnhp
|
b4ec077f16
|
Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others
Conflicts:
app/assets/javascripts/application.js
|
2016-04-20 11:28:06 +02:00 |
|
Raimond Garcia
|
63c24c15ce
|
Merge pull request #1078 from consul/subnavigation-layout
Fixes subnavigation layout
|
2016-04-19 23:59:18 +02:00 |
|
Alberto Garcia Cabeza
|
4a013a65bc
|
Fixes subnavigation layout
|
2016-04-19 23:45:03 +02:00 |
|
Alberto García Cabeza
|
b4298e8358
|
Merge pull request #1077 from consul/stats
removes duplicate graphs
|
2016-04-19 20:47:57 +02:00 |
|
rgarcia
|
0648c7f38d
|
removes duplicate graphs
|
2016-04-19 20:26:14 +02:00 |
|
Juanjo Bazán
|
59e2c8a122
|
Merge pull request #1072 from consul/oauth-signup-fix
Oauth signup fix
|
2016-04-19 16:01:00 +02:00 |
|
kikito
|
aa351256d0
|
spanish typo
spanish typo
style
|
2016-04-19 15:59:24 +02:00 |
|
Raimond Garcia
|
c563220236
|
Merge pull request #1075 from consul/dependencies
Dependencies
|
2016-04-19 13:55:12 +02:00 |
|
kikito
|
d577a2b82e
|
add spec for user identity erasure
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
8569e4f22e
|
adds rake task to destroy identities from erased users
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
e6c42860a7
|
destroy the identities associated with an user when the user deletes his account
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
581253219b
|
adds rake task to mark some users with duplicated usernames so they change them
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
d752a334f8
|
adds index for username
|
2016-04-19 13:33:52 +02:00 |
|
kikito
|
3637c95fe2
|
adds note to finish_signup
|
2016-04-19 13:33:17 +02:00 |
|