Commit Graph

987 Commits

Author SHA1 Message Date
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
ceebae644f removes question column from poll_questions 2016-11-22 11:41:10 +01:00
rgarcia
84bafa8107 adds specs for poll state 2016-11-21 11:19:03 +01:00
rgarcia
28e0c825f1 improves legibility of common abilities' spec 2016-11-18 20:10:58 +01:00
rgarcia
bb3c4c6399 adds consistency to ruby code style
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
kikito
13238e6a84 Merge branch 'polling' into polling-questions 2016-11-14 14:02:31 +01:00
rgarcia
63ccac963a adds booth backend for index, show, create and edit actions 2016-11-14 13:57:16 +01:00
rgarcia
6e6d2ac753 moves poll spec to poll folder 2016-11-14 13:56:49 +01:00
rgarcia
c1a9caeab0 adds poll CRU actions 2016-11-14 13:56:49 +01:00
rgarcia
44df91346a validates voter in census 2016-11-14 13:51:59 +01:00
kikito
38efad77f3 Changes the way question#copy_attributes_from_proposal works 2016-11-11 19:11:53 +01:00
kikito
048ada3e17 Adds poll partial result 2016-11-11 19:08:32 +01:00
kikito
d39f19abb8 Defines Poll::Question#answerable_by?(user) and uses it in abilities 2016-11-07 16:28:39 +01:00
kikito
f821d7beb7 Implements abilities for poll & poll_question 2016-11-07 10:37:22 +01:00
kikito
85aba10798 Initial work in Poll::Question 2016-10-28 18:02:28 +02:00
rgarcia
fe3451b4ba fixes specs 2016-10-26 10:31:05 +02:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
rgarcia
042cb14dbd moves poll spec to poll folder 2016-09-28 11:53:54 +02:00
rgarcia
0795da02d8 adds poll CRU actions 2016-09-25 10:21:16 +02:00
rgarcia
0ec3a8e8bf validates voter in census 2016-09-19 18:47:17 +02:00
Juanjo Bazán
8d48eccfed adds not_archived scope to proposal 2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99 archived proposals can not accept votes 2016-09-12 18:47:56 +02:00
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
Juanjo Bazán
3964988bb1 fixes specs
updates investment to have group_id & budget_id
2016-09-05 13:50:25 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +02:00
Juanjo Bazán
b8b71d0ab0 Merge branch 'master' into budget 2016-09-02 12:47:54 +02:00
Juanjo Bazán
46563f8222 Merge pull request #1194 from consul/notifications-polish
Notifications polish
2016-08-04 11:29:21 +02:00
rgarcia
9d9bf488fc does not create notifications for blocked or erased users 2016-08-02 20:52:20 +02:00
rgarcia
f21fda0898 fixes pending specs 2016-07-27 16:39:25 +02:00
rgarcia
fa052d990e marks specs as pending 2016-07-27 14:11:08 +02:00
rgarcia
93bfd492d4 marks specs as pending 2016-07-27 13:27:37 +02:00
rgarcia
c42a041d3a fixes specs 2016-07-19 16:20:45 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
rgarcia
f24a8887bb fixes conflicts with master 2016-07-19 14:49:27 +02:00
rgarcia
85d9dd4b84 integrates cancan with budgets 2016-07-19 14:41:55 +02:00
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
Alberto Garcia Cabeza
702cfe13d1 Fixes specs 2016-07-06 14:47:09 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
rgarcia
25ebb325d1 limits maximum number of messages able to send per day 2016-06-16 11:10:26 +02:00
rgarcia
e2689d640c refactors notification helpers 2016-06-15 12:12:56 +02:00
rgarcia
28d12fe55b removes sending individual proposal notifications via email 2016-06-15 10:43:02 +02:00
rgarcia
fd67294075 adds option to receive direct messages 2016-06-14 18:20:36 +02:00
rgarcia
9f19a5d143 adds option to receive email digest 2016-06-14 18:08:27 +02:00
Juanjo Bazán
1a2e9b37a1 improves ballot spec 2016-06-14 14:12:50 +02:00
Juanjo Bazán
4fcf138045 refactors investment adding to ballots 2016-06-14 14:03:21 +02:00
Juanjo Bazán
56a358a638 adds funds and feasibility validations to lines 2016-06-11 15:01:51 +02:00
Juanjo Bazán
ab008ed4e9 adds denormalization to budget::ballot::lines 2016-06-11 14:57:07 +02:00
Juanjo Bazán
b5a6828e41 adds Budget::Group model to group headings
many refactors through budget related models
2016-06-09 18:00:06 +02:00