kikito
|
2a2179d0f3
|
Merge branch 'master' into budget
|
2016-11-28 11:41:49 +01:00 |
|
rgarcia
|
5a664b9246
|
adds sr-only class and site name to accessibility span
|
2016-11-17 19:17:46 +01:00 |
|
rgarcia
|
e6a10cf1f1
|
adds accessibility span to social share buttons
|
2016-11-17 12:23:26 +01:00 |
|
Alberto Garcia Cabeza
|
6fd5e6a67a
|
unifies styles for participation not allowed
|
2016-10-31 16:50:13 +01:00 |
|
Juanjo Bazán
|
42c705e1e3
|
adds dossier editing of investments to valuation
|
2016-09-09 15:09:06 +02:00 |
|
kikito
|
7ad4a21229
|
Tries to make ckeditor work correctly with the asset pipeline
Reference: https://github.com/galetahub/ckeditor/issues/519
|
2016-08-30 12:05:46 +02:00 |
|
rgarcia
|
a23666683f
|
fixes conflicts with master
|
2016-07-19 15:50:22 +02:00 |
|
Alberto Garcia Cabeza
|
0a5369c7b4
|
Shows anonymous messages on focus whit tab
|
2016-06-06 18:04:58 +02:00 |
|
Andrés Pereira
|
a4dbd768ce
|
Custom folder structure: initial documentation, code and structure folders
|
2016-05-31 19:57:29 +02:00 |
|
MaiteHdezRivas
|
3b2bfc46cf
|
Admin option to add banners and show banners
|
2016-05-19 13:18:30 +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 |
|
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 |
|
Juanjo Bazán
|
e6a9cb4fcc
|
disable voting on sps if setting disabled
refactors hover messages on sps votes
|
2016-04-15 23:01:00 +02:00 |
|
palomahnhp
|
3c7b71018b
|
embed video in proposal show
|
2016-03-20 20:44:20 +01:00 |
|
Juanjo Bazán
|
3c815217f0
|
changes visible fields in dossier form
depending on feasibility value
|
2016-03-16 20:16:22 +01:00 |
|
palomahnhp
|
7d4936b577
|
track user verification and add statistics of verified users who did not vote proposals
|
2016-03-13 21:38:05 +01:00 |
|
Juanjo Bazán
|
15fc911bfb
|
adds js for input type=number to IE<9
|
2016-03-08 14:32:54 +01:00 |
|
Alberto Garcia Cabeza
|
3752f3a53b
|
Adds foundation 6 🎉
|
2016-02-26 19:33:33 +01:00 |
|
Juanjo Bazán
|
a0215871ad
|
forms.js redux
|
2016-02-25 14:03:05 +01:00 |
|
Juanjo Bazán
|
bc0a8542c2
|
removes admin.js manifest and favors forms.js
|
2016-02-25 12:38:48 +01:00 |
|
Juanjo Bazán
|
2cddad22d6
|
redux admin for spending proposals
adds dossier info
adds assignments to admin and valuators
|
2016-02-24 19:39:02 +01:00 |
|
Juanjo Bazán
|
91cedd78ab
|
adds new js manifest for admin
|
2016-02-24 18:54:17 +01:00 |
|
Juanjo Bazán
|
28bdd6b426
|
Merge pull request #875 from palomahnhp/inform_users_in_vote_comments
show link to sign in for no connect users
|
2016-02-11 17:28:17 +01:00 |
|
Juanjo Bazán
|
3bd767e36f
|
collapsable comments on proposals/debates
|
2016-02-10 19:27:15 +01:00 |
|
palomahnhp
|
837da1b6b2
|
show link to sign in for no connect users
|
2016-02-04 10:40:13 +01:00 |
|
kikito
|
99f95b4f32
|
makes the pr work on keyup and change instead of blur
|
2016-02-02 18:11:42 +01:00 |
|
Maite
|
8f1431ec3f
|
corrections about coding style
|
2016-02-01 17:11:29 +01:00 |
|
MaiteHdezRivas
|
5dd4633d6a
|
Merge branch 'suggest_before_creating'
Conflicts:
app/assets/javascripts/application.js
app/controllers/debates_controller.rb
app/controllers/proposals_controller.rb
config/locales/es.yml
config/routes.rb
db/schema.rb
spec/features/debates_spec.rb
spec/features/proposals_spec.rb
|
2016-01-27 13:11:23 +01:00 |
|
MaiteHdezRivas
|
7406904c51
|
adding suggest with coffescript
|
2016-01-27 12:32:44 +01:00 |
|
rgarcia
|
82279b4f6b
|
uses get instead of post to check username
|
2016-01-21 17:27:43 +01:00 |
|
rgarcia
|
cade157acd
|
fixes conflicts with master
|
2016-01-21 17:27:02 +01:00 |
|
rgarcia
|
6905d07638
|
uses jquery datepicker instead of html5 date field
|
2016-01-20 12:25:47 +01:00 |
|
rgarcia
|
e85ba440b6
|
configures jquery datepicker
|
2016-01-20 12:24:37 +01:00 |
|
Alberto Garcia Cabeza
|
4737f2be1b
|
Improves styles for advanced search
|
2016-01-18 12:13:38 +01:00 |
|
rgarcia
|
73bab1aad3
|
converts advanced search text to a js link
|
2016-01-16 20:40:47 +01:00 |
|
rgarcia
|
cf2dac91ad
|
renames html ids that have js behaviour
|
2016-01-16 20:15:14 +01:00 |
|
rgarcia
|
c68c2b9f1d
|
maintains search criteria
|
2016-01-13 19:25:49 +01:00 |
|
rgarcia
|
afca5c2b90
|
refactors javascript
|
2016-01-13 19:25:48 +01:00 |
|
Julian Herrero
|
7bbfcd74e2
|
check if username is available in registration form
|
2016-01-10 19:17:20 +01:00 |
|
kikito
|
b00dd2bf81
|
adds more i81n entries to gettext.js.coffee
|
2015-12-18 17:13:52 +01:00 |
|
Alberto Garcia Cabeza
|
f5dd8de398
|
Improves styles for annotator popup
|
2015-12-17 21:09:54 +01:00 |
|
Alberto Garcia Cabeza
|
c051750248
|
Fixes typos
|
2015-12-17 21:07:05 +01:00 |
|
kikito
|
5d2c37e71f
|
Displays a message when an unregistered user tries to annotate
|
2015-12-17 18:25:53 +01:00 |
|
kikito
|
5e067e8447
|
adds i18n to annotator
|
2015-12-17 17:32:17 +01:00 |
|
kikito
|
85b26f960d
|
hides the admin checkboxes in annotator
|
2015-12-17 16:46:46 +01:00 |
|
rgarcia
|
04ab0af8a3
|
fixes typo
|
2015-12-16 19:29:03 +01:00 |
|
kikito
|
2c9cbb9ce6
|
Uses the current user in annotator.js
|
2015-12-16 18:46:56 +01:00 |
|
kikito
|
0c96b2da8d
|
Removes all remaining traces of setting the user_id in the browser.
|
2015-12-16 18:44:10 +01:00 |
|