consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,611 Commits 1 Branch 0 Tags
d9c7adfa6c25a0e3db8cea05070e8231cd9ca1f7
Commit Graph

9611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
d9c7adfa6c [Security] Bump ffi from 1.9.23 to 1.9.25 
Bumps [ffi](https://github.com/ffi/ffi) from 1.9.23 to 1.9.25. **This update includes security fixes.**
- [Release notes](https://github.com/ffi/ffi/releases)
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ffi/ffi/compare/1.9.23...1.9.25)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-07 14:45:07 +00:00
Raimond Garcia
7014686b15 Merge pull request #2813 from javierv/2812-fix_admin_menu_not_showing 
Fix admin menu not showing for high IDs
 2018-09-07 15:52:02 +02:00
Raimond Garcia
09482aad09 Merge pull request #2785 from ziyan-junaideen/feature/1-nav-content-blocks 
Configurable Top Right and Main Navigation Menus
 2018-09-05 19:50:59 +02:00
Raimond Garcia
de141a5f88 Merge pull request #2834 from juan-fdz-hawa/2820_translate-accesibility-page 
Translate static pages
 2018-09-05 15:11:03 +02:00
Alberto
21f36e6be5 Merge branch 'master' into feature/1-nav-content-blocks 2018-09-05 12:41:07 +02:00
Juan Fernandez
653d36c9e6 Translate static pages 2018-08-04 15:28:41 -04:00
Raimond Garcia
8eb8bb9a59 Remove unused cleanup section 
Contributors seem to prefer concrete issues rather that general cleanup guidelines
Removing to make CONTRIBUTING.md more succinct and helpful
 2018-07-31 20:10:03 +02:00
Raimond Garcia
deafddae3c Clarify that specs are needed in almost all PRs 2018-07-31 20:08:36 +02:00
Alberto
909df04c7c Merge pull request #2822 from consul/devise-layout 
Fixes logo header on devise layout
 2018-07-31 18:41:46 +02:00
decabeza
a2bf8a85f4 Fixes logo header on devise layout 2018-07-31 18:08:09 +02:00
Alberto
8299a1910b Merge pull request #2821 from consul/admin-settings 
Admin settings
 2018-07-31 14:23:51 +02:00
decabeza
56bdcf4be2 Updates text on admin notifications spec 2018-07-31 13:25:53 +02:00
decabeza
b69d6292f1 Adds data deep link on admin settings filter subnav 2018-07-31 13:25:50 +02:00
decabeza
108e458678 Adds description to all admin settings 2018-07-31 13:25:39 +02:00
decabeza
3fee56e8fe Updates admin site customization specs 2018-07-31 12:55:05 +02:00
decabeza
bb05f86156 Updates admin legislation specs 2018-07-31 12:54:59 +02:00
decabeza
92f4c26fa4 Updates styles for admin tables 2018-07-31 12:54:52 +02:00
decabeza
defc04a5dc Unifies styles and views for admin geozones 2018-07-31 12:54:25 +02:00
decabeza
f77327e93c Unifies styles and views for admin site customization content blocks 2018-07-31 12:54:21 +02:00
decabeza
ee16900d1b Unifies styles and views for admin voting booths section 2018-07-31 12:54:12 +02:00
decabeza
6727583c0e Unifies styles and views for admin site content section 2018-07-31 12:52:35 +02:00
decabeza
dd98375c67 Unifies styles and views for admin sending of emails section 2018-07-31 12:52:31 +02:00
decabeza
a72eb380a2 Unifies styles and views for admin budgets 2018-07-31 12:52:21 +02:00
decabeza
f8707a73cd Unifies styles and views for admin legislation processes 2018-07-31 12:50:48 +02:00
decabeza
6f324c6931 Unifies styles and views for admin polls 2018-07-31 12:48:01 +02:00
decabeza
076f9dd474 Moves back link to root path from dashboard to header 2018-07-31 12:47:51 +02:00
Alberto
5546f5b125 Merge pull request #2817 from consul/custom-content 
Custom content
 2018-07-31 12:43:21 +02:00
Alberto
a6ce688253 Merge pull request #2819 from consul/logo-header 
Updates logo header sizes
 2018-07-31 11:50:32 +02:00
decabeza
c15769ba48 Updates logo header sizes and images for specs 2018-07-30 19:55:43 +02:00
decabeza
d80e7f9864 Updates emails specs 2018-07-30 19:35:21 +02:00
decabeza
71d45093b6 Removes custom content on proposals 2018-07-30 19:35:12 +02:00
decabeza
e14b7b67fb Removes custom content on footer 2018-07-30 17:59:33 +02:00
decabeza
b43945ad33 Removes custom content on management and devise views 2018-07-30 17:58:13 +02:00
decabeza
f2ec836587 Removes custom content on mailers 2018-07-30 17:57:25 +02:00
decabeza
62343ba49b Removes custom content on top links 2018-07-30 17:56:23 +02:00
decabeza
52fa9d27ac Removes custom content on index views pages 2018-07-30 17:55:56 +02:00
decabeza
2543cf5d6c Removes custom content on help pages 2018-07-30 17:45:19 +02:00
Raimond Garcia
33486f015c Merge pull request #2563 from wairbut-m2c/test/docker-with-headless-chrome 
Update Dockerfile to use Headless Chrome
 2018-07-30 15:30:43 +02:00
Javier Martín
3b82057178 Fix admin menu not showing for some admins 
There was a bug when finding the manager login, since we were only using
the last digit of their user ID.
 2018-07-28 22:06:11 +02:00
Javier Martín
157cd001d5 Add spec to expose a bug finding manager logged in 
I've moved the method to the User model in order to make it easier to
test. I'm not sure where it belongs, though.

There was already a failing spec in `spec/features/management_spec.rb`,
but it passed if run standalone because it only failed if previous tests
had already created nine users or more.
 2018-07-28 22:03:33 +02:00
Raimond Garcia
2c79197a05 Merge pull request #2809 from wairbut-m2c/backport/translatable-content-for-admin 
Basic content for I18n on Admin panel
 2018-07-27 18:01:00 +02:00
Ziyan Junaideen
f78d81bc81 ES admin i18n 2018-07-27 20:14:03 +05:30
Angel Perez
5d03fd210c Remove Valencian language key to fix translations spec 2018-07-27 08:06:14 -04: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
Alberto
fb19aafee7 Merge pull request #2778 from wairbut-m2c/backport/investments-moderation 
Allow budget investments to be moderated
 2018-07-27 12:34:17 +02:00
Alberto
3f388d8c6f Merge pull request #2808 from consul/memcached 
Increase max cache size to 2MB
 2018-07-27 12:33:40 +02:00
rgarcia
2995734762 Increase max cache size to 2MB 
We have lots of votes in this edition of participatory budgets and the
default cache size (1MB) is not enough to hold certain cache fragments
 2018-07-27 12:08:20 +02:00
Alberto
b5b35da708 Merge pull request #2807 from 16yuki0702/fix_issue_2783 
Fix active item on admin menu
 2018-07-27 11:51:29 +02:00
16yuki0702
c14fbf8540 Fixed misunderstanding 2018-07-27 16:34:00 +09:00
16yuki0702
57dbb0220a Fix active item on admin menu 2018-07-27 15:45:42 +09:00