Amaia Castro
|
d21b416ca0
|
Merge branch 'master' into legislation-module-stable
|
2017-02-23 19:14:47 +01:00 |
|
rgarcia
|
0cd72894ff
|
fixes date order symbols and syntax of portuguese locale
|
2017-02-18 11:21:59 +01:00 |
|
Fernando Blat
|
16c365ca1d
|
Improve social networks share text
|
2017-02-16 16:13:31 +01:00 |
|
Amaia Castro
|
2efa72ddd5
|
Merge branch 'legislation-module-stable' into 107-social-share-for-annotations
|
2017-02-14 18:14:00 +01:00 |
|
Fernando Blat
|
c81f98c963
|
Change text
|
2017-02-10 09:48:32 +01:00 |
|
Amaia Castro
|
132d5622ca
|
Checkboxes for process dates
|
2017-02-09 19:09:59 +01:00 |
|
Amaia Castro
|
5d37997a69
|
Redirect to allegations phase if open
|
2017-02-09 16:59:02 +01:00 |
|
Amaia Castro
|
d656de680d
|
Social share buttons for annotation
|
2017-02-09 15:32:42 +01:00 |
|
Amaia Castro
|
3009706b0d
|
Don’t allow comments on questions for unverified users and when the phase is closed
|
2017-02-08 18:19:10 +01:00 |
|
Amaia Castro
|
60c7947cb4
|
Merge branch 'master' into legislation-module-stable
|
2017-02-08 12:24:40 +01:00 |
|
Juanjo Bazán
|
b1a5a324c7
|
adds missing checkbox label for unfeasible investments
|
2017-01-26 13:15:43 +01:00 |
|
Fernando Blat
|
f7a6f8399b
|
Add pending translations
|
2017-01-23 14:58:12 +01:00 |
|
Amaia Castro
|
1af047089f
|
Add form to publish a new first level comment from the comments box
|
2017-01-19 15:42:50 +01:00 |
|
Amaia Castro
|
536784ee04
|
Merge pull request #72 from medialab-prado/back-improvements
Back improvements
|
2017-01-19 10:27:12 +01:00 |
|
Fernando Blat
|
6560e77554
|
Ask for confirmation when changing the page and
the forms watched do have changes
|
2017-01-18 13:37:11 +01:00 |
|
Fernando Blat
|
1537dd41da
|
Add forms placeholders
|
2017-01-18 11:46:19 +01:00 |
|
Fernando Blat
|
5c3f87c4a2
|
Merge pull request #70 from medialab-prado/reorganize-locale-files
Change comments texts in legislation questions
|
2017-01-17 16:39:08 +01:00 |
|
Amaia Castro
|
6c36fde6cc
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 15:45:33 +01:00 |
|
Amaia Castro
|
53e9837db3
|
Change texts for legislation questions comments
|
2017-01-17 15:42:42 +01:00 |
|
Amaia Castro
|
108d788985
|
Extract legislation translations to another yml file
|
2017-01-17 10:58:33 +01:00 |
|
Amaia Castro
|
00b488fe84
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 10:46:33 +01:00 |
|
Amaia Castro
|
65fcd83ee5
|
Don’t show new annotation/comment form if allegations phase is not open
|
2017-01-16 19:06:06 +01:00 |
|
Alberto Garcia Cabeza
|
45450d74ff
|
improves styles for unfeasible investments
|
2017-01-16 18:45:42 +01:00 |
|
rgarcia
|
0f1a98da7d
|
fixes conflicts with master
|
2017-01-15 19:04:12 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
Alberto Garcia Cabeza
|
9741ee859a
|
updates i18n and specs
|
2017-01-15 14:02:08 +01:00 |
|
Alberto Garcia Cabeza
|
1de39edf92
|
adds styles and i18n for mailer budget investment created
|
2017-01-15 13:52:09 +01:00 |
|
rgarcia
|
abd8cd2faf
|
fixes translations
|
2017-01-14 17:13:59 +01:00 |
|
rgarcia
|
79767b5f1d
|
adds translations
|
2017-01-14 17:02:41 +01:00 |
|
Fernando Blat
|
755ddab2cb
|
Amend translations
|
2017-01-14 16:42:59 +01:00 |
|
Fernando Blat
|
4431d95d31
|
Basic annotation creation
|
2017-01-14 16:42:12 +01:00 |
|
rgarcia
|
82322ee233
|
sends budget investment created email
|
2017-01-14 16:10:43 +01:00 |
|
Raimond Garcia
|
7f88100599
|
Merge pull request #1352 from consul/feasibility_link
Feasibility index
|
2017-01-14 12:36:26 +01:00 |
|
Juanjo Bazán
|
36140e0ce3
|
adds link to unfeasible investments to index page
|
2017-01-14 11:33:49 +01:00 |
|
rgarcia
|
6d71cd985c
|
displays appropriate vote info depending on phase
|
2017-01-13 21:15:08 +01:00 |
|
Raimond Garcia
|
4c818bfcc4
|
Merge pull request #1349 from consul/budgets-vote-permissions
User permissions for selecting phase
|
2017-01-13 18:34:31 +01:00 |
|
rgarcia
|
b2b9954e6d
|
allows user to support only in one heading per group
|
2017-01-13 15:24:57 +01:00 |
|
Juanjo Bazán
|
238c01cecd
|
Merge pull request #1345 from aspgems/bug_compile_ckeditor_locales
Fixes bug. Compiles all locales for ckeditor.
|
2017-01-13 11:49:58 +01:00 |
|
Juanjo Bazán
|
a771408f4b
|
Merge pull request #1336 from aspgems/bug_filter_advance_search
Fixes values of official_level options for selects in search filters.
|
2017-01-13 11:00:00 +01:00 |
|
Juanma
|
119061bd4c
|
Fixes bug. Compiles all locales for ckeditor.
|
2017-01-13 09:40:33 +01:00 |
|
Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
Amaia Castro
|
f974883556
|
Refactor legislation comments partials
|
2017-01-11 16:27:22 +01:00 |
|
Juanjo Bazán
|
7ef481ef0c
|
Merge pull request #1337 from consul/devise-views
Devise views
|
2017-01-11 12:38:41 +01:00 |
|
Raimond Garcia
|
f2dc822bfa
|
Merge pull request #1334 from consul/budgets
WIP Budgets
|
2017-01-10 22:43:27 +01:00 |
|
Juanjo Bazán
|
7a448b6890
|
adds BudgetInvestment case to users_helpers
|
2017-01-10 20:58:01 +01:00 |
|
rgarcia
|
0049b6154c
|
testing devise mailer
|
2017-01-10 20:04:01 +01:00 |
|
Amaia Castro
|
4f539b374f
|
View comments for draft text
|
2017-01-10 17:25:02 +01:00 |
|
Juanjo Bazán
|
205b988f49
|
changes copy
|
2017-01-10 13:10:39 +01:00 |
|
Alberto Garcia Cabeza
|
ea70e0a5db
|
removes duplicated i18n keys
|
2017-01-09 18:49:45 +01:00 |
|
Alberto Garcia Cabeza
|
201a222cd3
|
improves styles for omniauth buttons
|
2017-01-09 18:49:29 +01:00 |
|