consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

418 Commits

Author SHA1 Message Date
María Checa
d5c7858f6c Removed officer alert in admin section 2019-05-16 14:45:46 +02:00
Juanjo Bazán
5121c9b6d8 removes booth message from admin interface 2019-05-16 13:37:47 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
rgarcia
9329e4b6ea hot fix current booth 2019-03-28 15:50:34 +01:00
rgarcia
4761ac91bd Displays officing booth in layout 2019-03-28 15:47:52 +01:00
decabeza
2af154d539 Merge branch 'master' into proposal-dashboard 2019-03-28 01:26:04 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +01:00
Alberto
29a87e2746 Merge branch 'dashboard' into dashboard-polish 2019-03-26 12:19:20 +01:00
Javi Martín
3e4e65ead7 Use double quotes inside ERB 
We were using single quotes inside ERB code when that code was inside
HTML double quotes.
 2019-03-25 14:58:54 +01:00
Javi Martín
4c35df4812 Use double quotes inside string interpolation 2019-03-25 14:58:54 +01:00
taitus
6342d598f7 Update active resources count for proposal 
Fix: Sum default resources (mail, poster, poll) to actives resources for a proposal.
 2019-03-21 12:29:31 +01:00
Julian Herrero
4df9a1a1b4 Move HTML settings to content blocks settings page 
- Rename html settings keys
- Show html settings next to content blocks page
- Hide html settings from configuration tab
 2019-03-19 19:45:34 +01:00
decabeza
e949d4d163 Refactor proposal total counter value 2019-03-19 16:59:57 +01:00
decabeza
9b95870c12 Remove empty div 2019-03-19 16:41:49 +01:00
Julian Herrero
25ed245689 Use double quotes in app/views/layouts 2019-03-19 12:16:50 +01:00
decabeza
ccee843da7 Remove unused settings 
These settings are customised for Madrid's fork. On CONSUL any user can include new links using site customisation content blocks from admin panel.
 2019-02-18 15:40:11 +01:00
Alessandro Cuoghi
36abba15e6 Dashboard proposals stats V.2 
- Found new solution to show dashboard proposals stats
- Added new class for behaviour change in the medium version
- Moved the progress bar to the bottom
- Moved below by adding counter-label class to the text support
- Added class to support text to push under the counter
 2019-02-02 17:33:55 +01:00
Alessandro Cuoghi
e0fa82a533 Change layout dashboard proposals stats 
Created new layout to avoid text jump support
 2019-02-02 17:33:55 +01:00
Julian Herrero
d77183ee09 Improvement - CRUD budgets and content blocks 2019-01-14 12:59:48 +01:00
decabeza
546105d989 Merge branch 'master' into dashboard-master 2018-10-19 01:48:37 +02:00
decabeza
84975143bb Removes dashboard mailer layout 2018-10-13 12:59:24 +02:00
decabeza
aaaaa00807 Adds styles to dashboard layouts, progress, show and partials 2018-10-05 18:04:30 +02:00
Juan Salvador Pérez García
92c0e34c7a Fixed error in layout 
An error was introduced while trying to fix merge conflicts. It is fixed
now.
 2018-10-01 10:13:45 +02:00
Juan Salvador Pérez García
488e7e081f Merge branch 'dashboard' into rebase_consul_master 2018-09-27 09:18:27 +02:00
Juan Salvador Pérez García
42d448248c Routes have been refactored 
Dashboard routes have been refactored. Now instead of having resources
for dashboard and routes inside a dashboard namespace the proposal
routes contain a dashboar singleton containing everything related to it.
 2018-09-17 15:44:45 +02:00
decabeza
a2bf8a85f4 Fixes logo header on devise layout 2018-07-31 18:08:09 +02:00
decabeza
076f9dd474 Moves back link to root path from dashboard to header 2018-07-31 12:47:51 +02:00
decabeza
e14b7b67fb Removes custom content on footer 2018-07-30 17:59:33 +02:00
Alberto
65e4435822 Merge pull request #2137 from wairbut-m2c/iagirre-admin-menu-in-management 
Add admin menu in management view (if user is admin)
 2018-07-27 12:35:07 +02:00
Juan Salvador Pérez García
8876b285ce Fixes #229 
Adds email feature for proposals dashboard
 2018-07-25 13:28:44 +02:00
Juan Salvador Pérez García
e5f9cf6710 Fixed #239 
Proposals dashboard refactored to dashboard.
Added missing specs for the dashboard.
 2018-07-24 15:52:43 +02:00
decabeza
dcec003d0e Updates header markup and includes new logo 2018-07-20 18:50:49 +02:00
Juan Salvador Pérez García
0adecfa95e Fixes #208 
Changes in feature view.
 2018-07-17 17:59:12 +02:00
Juan Salvador Pérez García
a872c5b5df Fixes #200 
Adds settings to complete the polls card and feature view.
 2018-07-17 17:59:11 +02:00
Juan Salvador Pérez García
53baf983b5 Implements #169 
Community counter now shows the community members. For performance
reasons this information is refresed once per hour.
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
6baabf2a7e Fixes #171 
Button that redirects to proposal in the proposals dashboard now:

* opens the proposal in a different tab.
* Text shown will be 'preview proposal' for proposals in draft state.
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
084e9855e4 Fixed some failing specs 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
59eb1a4f47 Adds progress indicator 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
50d4523ded Current goal indicator 
Indicator with current goal and the supports required to achieve it has
been added
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
a22027a343 Added button that redirects to the proposal 
Dashboard header includes a button that redirects to the proposal.
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
cc3802746b Added totals counter 
Added totals counter to dashboard header
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
64cf7c1257 Body header 
Body header contains the proposal name, a label with its status and an
action title.
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
d2a05ee779 Dashboard proposal menu redesign 
Dashboard proposal menu has been redesigned to look like the available
mock-ups.
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
89f3da25b9 Implements #138 and #139 
Implements graph with supports for the given  period.
 2018-07-17 17:52:47 +02:00
Juan Salvador Pérez García
212c088d35 Implements #144 
Creates the basic layout for the dashboard
 2018-07-17 17:47:40 +02:00
iagirre
2fafceb81d Errors after running Travis fixed 2018-07-15 17:35:30 -04:00
iagirre
7a7ae5fa2e The admin menu is shown in the management section if the user who logged in is an admin 2018-07-15 17:32:30 -04:00
iagirre
81d8b9b9ed Admin menu added to management 2018-07-15 17:31:21 -04:00
Javier Martín
0cf50d8116 Rename partial to diable animations in tests. 
With this name, it's easier to understand what it does.
 2018-06-26 16:04:13 +02:00
Javier Martín
a972e7b978 Don't use CSS animations when testing. 
Just like jQuery animations, they can make tests fail when using
Capybara.
 2018-06-24 02:51:52 +02:00