Raimond Garcia
|
593e77147c
|
Merge pull request #1232 from usabi/custom_locales_load_fix
Fixes custom locales inclusion.
|
2016-10-06 16:47:31 +02:00 |
|
Marcia
|
680c0636ed
|
expired password last
|
2016-10-06 14:19:48 +02:00 |
|
Marcia
|
1f72c5cc74
|
improves expired password view
|
2016-09-30 10:10:20 +02:00 |
|
Marcia
|
4269f3810b
|
Merge remote-tracking branch 'upstream/master' into admin_password_expired
|
2016-09-27 13:26:08 +02:00 |
|
Marcia
|
78c6a30424
|
optimize code
|
2016-09-27 13:07:06 +02:00 |
|
Ignacio Aliende García
|
e4e2706af6
|
Fixes custom locales inclusion.
|
2016-09-20 17:34:26 +01:00 |
|
rgarcia
|
7d4d9b0ead
|
sorts archived proposals by votes
|
2016-09-16 19:42:18 +02:00 |
|
Alberto Garcia Cabeza
|
910b24936d
|
Merge branch 'master' into voting-proposals
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
|
2016-09-15 13:58:53 +02:00 |
|
Marcia
|
fa833f5a4a
|
modificado otro mensaje en los test
|
2016-09-15 13:06:03 +02:00 |
|
Marcia
|
4832558948
|
modificado mensaje en el test
|
2016-09-15 12:21:25 +02:00 |
|
Marcia
|
8d883b1e17
|
mejoras de codigo
|
2016-09-15 11:45:03 +02:00 |
|
Alberto Garcia Cabeza
|
89340d4647
|
Deletes author_id on specs
|
2016-09-14 12:20:22 +02:00 |
|
Alberto Garcia Cabeza
|
30c11c9e22
|
Fixes specs
|
2016-09-14 11:41:29 +02:00 |
|
Juanjo Bazán
|
2142351743
|
archived proposals should not appear in 'featured'
|
2016-09-13 12:56:49 +02:00 |
|
Juanjo Bazán
|
11dbc05a80
|
removes archived proposals from index/search pages
|
2016-09-13 12:56:10 +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
|
aa05b0259e
|
fixes featured proposal creation in failing spec
|
2016-09-12 17:37:55 +02:00 |
|
Alberto Garcia Cabeza
|
3bbc2862d2
|
Adds admin setting 'months to archive proposals'
|
2016-09-09 18:02:02 +02:00 |
|
Alberto Garcia Cabeza
|
fa3b503c47
|
Adds specs
|
2016-09-09 17:32:21 +02:00 |
|
Juanjo Bazán
|
974c4d6d70
|
adds specs for proposal ballots
|
2016-09-08 12:43:06 +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
|
24bc8cca20
|
runs all specs
|
2016-08-03 20:56:33 +02:00 |
|
rgarcia
|
4f4a5b68e5
|
runs all spec file
|
2016-08-03 20:50:37 +02:00 |
|
rgarcia
|
3b5e0b55c0
|
tries to fix flacky spec
|
2016-08-03 20:45:36 +02:00 |
|
rgarcia
|
5bd7fdb263
|
fixes specs
|
2016-08-03 20:05:08 +02:00 |
|
rgarcia
|
63274dfe08
|
marks notifications as emailed after rake
|
2016-08-03 19:48:43 +02:00 |
|
rgarcia
|
0faff2f01c
|
adds specs
|
2016-08-03 19:33:43 +02:00 |
|
rgarcia
|
9d9bf488fc
|
does not create notifications for blocked or erased users
|
2016-08-02 20:52:20 +02:00 |
|
rgarcia
|
99b9c3867e
|
adds pending spec
|
2016-08-02 20:52:08 +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 |
|
Andrés Pereira
|
c5e6735caa
|
Change madrid.es to consul.dev - closes #1169
|
2016-07-14 16:28:16 +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 |
|
Alberto Garcia Cabeza
|
67f07ba73a
|
Fixes typo
|
2016-07-06 14:48:51 +02:00 |
|
Alberto Garcia Cabeza
|
edd8883deb
|
Fixes specs
|
2016-07-06 13:43:05 +02:00 |
|
rgarcia
|
96630f88f2
|
takes into account emails separated by commas without spaces
|
2016-06-29 21:46:03 +02:00 |
|
rgarcia
|
745de9bb77
|
sends invitation email to users
|
2016-06-27 23:37:58 +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 |
|
rgarcia
|
51d688897a
|
displays badge option if official position is level 1
|
2016-06-20 21:37:03 +02:00 |
|
rgarcia
|
98040e191e
|
fixes conflicts with fork
|
2016-06-20 21:33:34 +02:00 |
|
Enrique García
|
588a2d84e4
|
Merge pull request #1154 from consul/stats
Adds stats for proposal notifications and direct messages
|
2016-06-16 18:42:10 +02:00 |
|
rgarcia
|
f9a2f5d5dc
|
adds specs for stats
|
2016-06-16 17:59:56 +02:00 |
|
rgarcia
|
8ee7d535ba
|
generic message for max_per_day setting
|
2016-06-16 15:54:19 +02:00 |
|
rgarcia
|
18dd9c95f3
|
fixes specs
|
2016-06-16 12:06:26 +02:00 |
|
rgarcia
|
b3fd5e225a
|
Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications
|
2016-06-16 11:23:23 +02:00 |
|
rgarcia
|
91860cb409
|
validates that a user does not want to receive direct messages
|
2016-06-16 11:23:03 +02:00 |
|