rgarcia
|
7d34621c1c
|
removes duplicate code
|
2016-07-27 13:05:00 +02:00 |
|
rgarcia
|
3c55d66591
|
fixes conflicts with budget
|
2016-07-27 11:41:46 +02:00 |
|
rgarcia
|
1587222cba
|
tmp commit
|
2016-07-20 14:06:27 +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 |
|
rgarcia
|
33a44fc470
|
uses a module to structure controller code
|
2016-07-19 13:49:00 +02:00 |
|
rgarcia
|
1e35ca4895
|
adds budget structure for views and controllers
|
2016-07-19 13:16:30 +02:00 |
|
Juanjo Bazán
|
dc7ee45766
|
uses before_action instead of before_filter
before_filter is deprecated
|
2016-07-18 14:50:28 +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 |
|
Alberto Garcia Cabeza
|
947b2bcb0d
|
Adds user invites views on management
|
2016-06-27 14:25:20 +02:00 |
|
rgarcia
|
00dbbd0689
|
fixes specs (unauthenticated users can view spending proposal show)
|
2016-06-20 21:54:45 +02:00 |
|
rgarcia
|
98040e191e
|
fixes conflicts with fork
|
2016-06-20 21:33:34 +02:00 |
|
rgarcia
|
3c2098eb14
|
improves legibility of counts
|
2016-06-16 18:40:05 +02:00 |
|
rgarcia
|
b7e3129ec1
|
uses more efficient count
|
2016-06-16 18:35:34 +02:00 |
|
rgarcia
|
0abc9c8376
|
adds stats for direct messages and proposal notifications
|
2016-06-16 17:42:16 +02:00 |
|
rgarcia
|
18dd9c95f3
|
fixes specs
|
2016-06-16 12:06:26 +02:00 |
|
rgarcia
|
28d12fe55b
|
removes sending individual proposal notifications via email
|
2016-06-15 10:43:02 +02:00 |
|
rgarcia
|
ce6072d17b
|
sends a copy of the direct message to the sender
|
2016-06-14 18:55:28 +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 |
|
rgarcia
|
fea3aef5bb
|
updates permissions for direct messages
|
2016-06-09 17:35:19 +02:00 |
|
rgarcia
|
c3d06c8bd0
|
adds direct messages
|
2016-06-08 20:44:54 +02:00 |
|
rgarcia
|
0e86cd89d6
|
adds permissions with cancan for new, create and show
|
2016-06-08 13:46:17 +02:00 |
|
rgarcia
|
a0ddde16e9
|
adds notifications for proposals
|
2016-06-07 22:03:14 +02:00 |
|
kikito
|
d1311438e7
|
Sets the random seed in the investments_controller
|
2016-06-07 11:11:00 +02:00 |
|
kikito
|
a9dbc6160a
|
Fixes typo in ApplicationController
|
2016-06-07 11:09:43 +02:00 |
|
rgarcia
|
ad697cd2c1
|
adds preference to receive proposal notifications
|
2016-06-06 12:55:33 +02:00 |
|
rgarcia
|
fc6cc090f8
|
displays notifications in proposal view
|
2016-06-06 12:21:48 +02:00 |
|
kikito
|
7051333028
|
Adds actions to application_controller and investments_controller
|
2016-06-03 18:50:28 +02:00 |
|
kikito
|
9f3b99f0a6
|
Allows blocks in has_orders concern
|
2016-06-03 18:30:47 +02:00 |
|
rgarcia
|
ca26b3423b
|
sends notification email to each voter
|
2016-06-01 21:40:23 +02:00 |
|
rgarcia
|
6e4ed0b895
|
adds link to send message from my activity
|
2016-06-01 21:01:24 +02:00 |
|
rgarcia
|
f5375e813d
|
stores a proposal notification
|
2016-06-01 17:23:56 +02:00 |
|
kikito
|
fa6f34bf5c
|
Adds basic Budget controller / views
|
2016-05-31 19:26:56 +02:00 |
|
Alberto Garcia Cabeza
|
7c65a6ee1a
|
Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin
|
2016-05-23 12:14:52 +02:00 |
|
Juanjo Bazán
|
65335d1344
|
optimizes stat query
|
2016-05-20 11:05:10 +02:00 |
|
MaiteHdezRivas
|
3b2bfc46cf
|
Admin option to add banners and show banners
|
2016-05-19 13:18:30 +02:00 |
|
Juanjo Bazán
|
c4bf90f576
|
adds managers section to admin
|
2016-05-11 11:24:38 +02:00 |
|
Juanjo Bazán
|
d1e50d70d6
|
managers can login to /management
|
2016-05-10 19:10:02 +02:00 |
|
Juanjo Bazán
|
fd8fb49015
|
hides retire link if no author/admin
|
2016-05-06 12:18:38 +02:00 |
|
Juanjo Bazán
|
2d4ac24465
|
adds missing param
|
2016-04-28 18:36:22 +02:00 |
|
Raimond Garcia
|
712e42ca9d
|
Merge pull request #1104 from consul/admin-access-to-management
Admin access to management
|
2016-04-28 16:55:10 +02:00 |
|
kikito
|
6c9c2f1b96
|
removes obsolete/deprecated code
|
2016-04-28 14:00:20 +02:00 |
|
kikito
|
9ac6e2d60b
|
Uses invisible_captcha's default "foo fast" action
|
2016-04-28 12:47:04 +02:00 |
|
Juanjo Bazán
|
2eabab657a
|
allows admin to sign in into management
|
2016-04-27 17:26:19 +02:00 |
|
Juanjo Bazán
|
585f3dd6c7
|
removes use of current_user in management
favors managed_user
to avoid conflicts with logged admin users
|
2016-04-27 17:26:19 +02:00 |
|
kikito
|
303b17c238
|
Adds invisible_captcha to user & organization registrations
|
2016-04-27 16:13:50 +02:00 |
|
kikito
|
7adc706d23
|
Moves redirect_timestamp_spam to AppController
|
2016-04-27 16:13:49 +02:00 |
|
kikito
|
289182b145
|
Adds invisible_captcha to proposals, debates & sps
|
2016-04-27 16:12:32 +02:00 |
|