Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: refinery/refinerycms
...
head fork: refinery/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Dec 06, 2014
@parndt parndt Prepare the database all in one step, removing another rake task. f1602a8
@simi simi Merge pull request #2793 from refinery/dummy-app-speed
Dummy app speed
0238ccd
@parndt parndt Dynamically switch Capybara.javascript_driver depending on requirement 856ede1
@parndt parndt Expect save to increase the page count. 4c3242c
Commits on Dec 07, 2014
@simi simi Merge pull request #2794 from refinery/haunting
Dynamically switch Capybara.javascript_driver depending on requirement
16908be
@parndt parndt You've got to clear tmp/cache after changing backend_route f0e2b28
@parndt parndt Loading spring for bin/rails doesn't work in the root 83eb052
@simi simi Merge pull request #2796 from refinery/spring-forward
Loading spring for bin/rails doesn't work in the root
54294a3
Commits on Dec 08, 2014
@darmens darmens menu_branch partial no longer exists 1b3fa6c
@darmens darmens how to override menu example is no longer needed ed96ace
@darmens darmens added how to override layouts/application example e9eb8e7
@toch toch use `do...end` for multi-line block 2491ac8
@toch toch space out `protected` and remove trailing spaces 1b541f4
@toch toch Fix Malformed PullReview conf file 83d6cdd
@simi simi Merge pull request #2792 from darmens/patch-3
menu_branch partial no longer exists
fb0cc30
Commits on Dec 09, 2014
@simi simi Update generator_spec to 0.9.3 to get rid of deprecation warnings. 114fdd1
Commits on Dec 10, 2014
@simi simi Clean locale for every test group. d490274
Commits on Dec 11, 2014
@arthurtalkgoal arthurtalkgoal fix dialect overflow in locale picker
    for example show TW instead of zh-TW
e8daaa7
@simi simi Merge pull request #2805 from refinery/dialect-overflow
fix dialect overflow in locale picker
772a698
@glamouracademy glamouracademy Changed guide, '2- Getting Started 5.4 Styling your views', local pat…
…h to reflect image
b0933c1
@parndt parndt Merge pull request #2808 from glamouracademy/master
Changed '2- Getting Started 5.4 Styling your views' guide, local path t...
a61b03f
@prokopsimek prokopsimek Update database.yml examples 9bf1f46
@parndt parndt Merge pull request #2807 from prokopsimek/patch-6
Update database.yml examples
ca697a3
Commits on Dec 12, 2014
@parndt parndt Merge pull request #2797 from refinery/clean-locales-after-test
Clean locale for every test group.
4b1a95e
@simi simi Bye Selenium! f39f1dd
@simi simi Merge pull request #2806 from refinery/bye-selenium
Bye Selenium!
dd12646
Commits on Dec 15, 2014
@parndt parndt Refactored image_fu helper to only use geometry when not nil. c3a9521
@darmens darmens english fixed 348d740
Commits on Dec 18, 2014
@parndt parndt Merge remote-tracking branch 'toch/fix-style-issues'
Conflicts:
	core/app/views/refinery/admin/_locale_picker.html.erb
dda7659
Commits on Dec 22, 2014
@parndt parndt Fixed incorrect assertion; saving a duplicate shouldn't increment count 5441303
Commits on Dec 23, 2014
@parndt parndt Merge pull request #2810 from refinery/refactored-image-fu-to-prevent…
…-bugs

Refactored image_fu helper to only use geometry when not nil.
f453944
Commits on Dec 27, 2014
@paullaz paullaz bump sass-rails dependency to >=4.0, <5.1 for Foundation 5.5+ compata…
…bility
8bfd3be
@simi simi Merge pull request #2820 from paullaz/master
bump sass-rails dependency to >=4.0, <5.1 for Foundation 5.5+ compat
cb4903a
Commits on Dec 28, 2014
@parndt parndt Removed unneeded assignment; added parentheses to method signature. b468eee
@parndt parndt Fixed 'Ambiguous block operator' warning. a8a50b9
@parndt parndt Prevented shadowing of outer local variable 21fe8fa
@gogogarrett gogogarrett Making the block parameter not as ambiguous. b8cf197
@gogogarrett gogogarrett removing unused local variable. 1f718d2
@simi simi Merge pull request #2756 from refinery/refactorcop
Refactorcop refactors
a42907c
Commits on Dec 30, 2014
@parndt parndt Fix refinerycms-i18n dependency version and allow coffee-rails 4.1.x db0ac67
@parndt parndt Travis now supports Ruby 2.2.0 dcd8b46
Commits on Jan 02, 2015
@darmens darmens added 'edit this page' button to site bar 60e2cb5
Commits on Jan 04, 2015
@parndt parndt Merge pull request #2814 from darmens/features/edit_this_page
Features/edit this page fixes issue #2800
f1a51da
Commits on Jan 06, 2015
@bricesanchez bricesanchez Disable turbolinks for edit page link da3154e
@parndt parndt Merge pull request #2823 from bricesanchez/patch-1
Disable turbolinks for edit page link
a2d5381
Commits on Jan 07, 2015
@bricesanchez bricesanchez Create 6 - Generates a custom form.textile
Small adaptation of the USAGE file of form generator. It's simple and effective. 

It's great to have this guide because not everyone knows that this generator exists before having a deep look of the source code of RefineryCMS.
3d1a5a5
@bricesanchez bricesanchez Fix typo
[ci skip]
d6a0ac2
Commits on Jan 13, 2015
@darmens darmens Update it.yml 8dfe329
@ugisozols ugisozols Merge pull request #2829 from darmens/patch-4
Italian locale amend
8db275a
Commits on Jan 15, 2015
@darmens darmens Update it.yml b3a3057
@simi simi Merge pull request #2831 from darmens/patch-5
Update it.yml
f5624c4
Commits on Jan 16, 2015
@isaacfreeman isaacfreeman Vertical admin tabs
Having admin tabs at the top running horizontally means they have to fit into a finite space. If there are too many, they go into a carousel, which is very inconvenient for navigation, and makes the rightmost tabs invisible to users.

I've put the admin tabs vertically at the left of the admin area. This gives as much vertical space (with scrolling) as needed.

- positioned admin tabs vertically at left
- wrapped admin content in #admin_container div
- corresponding #login_container div for login page
- more rounded corner mixins
- box-sizing mixin
- admin_background mixing provides faux column gradient background for admin area (modern browsers and IE10 up)
- SASS variables for $menu_width and $standard_rounding
- sortable_menu.js setting changed to y axis
- removed jcarousel and images

Conflicts:
	core/app/assets/images/refinery/carousel-left.png
	core/app/assets/images/refinery/carousel-right.png
	core/app/assets/stylesheets/refinery/layout.css.scss
aa2250f
@isaacfreeman isaacfreeman - replaced arrow_switch.png with arrow_up_down.png and arrow_left_rig…
…ht.png

- moved SASS utility mixins to a separate file
- generalised admin_background() mixin to faux_columns_2()

Conflicts:
	core/app/assets/stylesheets/refinery/layout.css.scss
dde4460
@isaacfreeman isaacfreeman - removed different padding/margin for active tab 82a93a8
@parndt parndt - Increased admin width.
- Removed admin rounding.
- Gave menu a defined background.
- Changed width of search box.
afca0bc
@bricesanchez bricesanchez Update layout fo fix left side tabs CSS and some bugs on layout
Conflicts:
	core/app/assets/stylesheets/refinery/layout.css.scss
d6e6e11
@bricesanchez bricesanchez Fix background color in menu 75716d6
@parndt parndt Documented changes for #2734 cb22d5c
@bricesanchez bricesanchez Increase page width to fix wymeditor toolbar aee45e1
@bricesanchez bricesanchez Update fr.yml
Fix some typos in french locales
ba94a2c
@simi simi Merge pull request #2834 from bricesanchez/patch-3
Update fr.yml
2c5e9aa
@parndt parndt Merge pull request #2734 from refinery/left-side-tabs
Left side tabs
e748c5b
Commits on Jan 18, 2015
@natea natea need -m for commit message 08556b6
Commits on Jan 19, 2015
@parndt parndt quiet_assets is only required in development mode
[ci skip]
021b474
@simi simi Merge pull request #2838 from refinery/quiet-assets-development-only
quiet_assets is only required in development mode
bb89fd2
Commits on Jan 21, 2015
@parndt parndt Require at least refinerycms-wymeditor 1.0.4. Fixes #2741 5686fd7
@parndt parndt Fixes #2836 by updating rspec syntax in generated files. a8b65cf
@parndt parndt Clear before_inclusion_procs and after_inclusion_procs after calling …
…them.

This prevents a bug where supplied procs were run over and over again,
resulting in e.g. plugins being registered multiple times.
09221a9
@simi simi Merge pull request #2844 from refinery/bugfix/clear-inclusion-procs-a…
…fter-calling

Clear before_inclusion_procs and after_inclusion_procs after calling them
f0312e4
@parndt parndt Merge pull request #2843 from refinery/fix-issue/2836
Fixes #2836 by updating rspec syntax in generated files.
0252e17
@CJBrew CJBrew Use refinery_user for login
Conflicts:
	core/lib/generators/refinery/engine/templates/spec/features/refinery/namespace/admin/plural_name_spec.rb.erb
edde5ed
@parndt parndt Merge pull request #2845 from CJBrew/rspec_issue_wip_2
Login using :refinery_user
ee37409
@parndt parndt Merge pull request #2825 from bricesanchez/patch-2
Create 6 - Generates a custom form.textile
4986341
@parndt parndt refinerycms-i18n 3.0.0 is a released gem now. e977246
@simi simi Merge pull request #2846 from refinery/release-refinery-i18n-3-0-0
refinerycms-i18n 3.0.0 is a released gem now.
5f9ed45
Commits on Jan 22, 2015
@bricesanchez bricesanchez Improve site bar CSS to be responsive without CSS framework
Remove useless mixin and var of rounded borders

Little clean in #editor_switch
79b23e6
@bricesanchez bricesanchez Remove #page_parts_controls width
Fix overflow of this tag when there is a lot of tabs
d53d36f
@simi simi Merge pull request #2849 from bricesanchez/patch-4
Remove #page_parts_controls width
1a03020
@parndt parndt Merge pull request #2848 from bricesanchez/site-bar-rwd
Improve site bar CSS to be responsive without CSS framework
dc5d428
@bricesanchez bricesanchez Improve Site bar when site_name is long 8175ef8
@parndt parndt Merge pull request #2850 from bricesanchez/site-bar-rwd
Improve Site bar when site_name is long
a55e76f
Commits on Jan 23, 2015
@parndt parndt Don't show a bottom border when hovering a menu item.
This fixes an issue where the UI was jiggling around on hover.

[ci skip]
49451b1
@bricesanchez bricesanchez Re-add removed CSS for #records.tree. See afca0bc?diff=unified cf81446
@parndt parndt Merge pull request #2851 from bricesanchez/records-tree-css
Re-add missing CSS for #records.tree. See https://github.com/refinery/re...
5af456c
Commits on Jan 25, 2015
@parndt parndt Require refinerycms-wymeditor >= 1.0.5 which fixes #2847 e1e725b
@parndt parndt Reordered CI runlist to get indicative results earlier. 8d05218
@parndt parndt Run CI for newer rubies first. 9475045
@parndt parndt Added Refinery::Pages.config.friendly_id_reserved_words which fixes #… a448e3f
@parndt parndt Require refinerycms-wymeditor >= 1.0.6 bf189c0
@parndt parndt Merge pull request #2855 from refinery/fix-2847
Added Refinery::Pages.config.friendly_id_reserved_words which fixes #2847
eec2ce1
Commits on Jan 26, 2015
@parndt parndt Added better support for `:at` Rails mount option.
This is done via changing `Refinery::Core.config.mounted_path`
which is located inside `config/initializers/refinery/core.rb`
in an application which has Refinery.

Fixes #2740
099b750
@simi simi Merge pull request #2857 from refinery/feature/refinery-subfolder-iss…
…ue-2740

Added better support for `:at` Rails mount option.
2d1d8a4
@parndt parndt Tidied up the edge installation template. ee60a92
@parndt parndt Removed dragonfly-s3_data_store as a hard dependency.
Now, it gets added in place of fog when you specify `--heroku`
while installing.

For example:

rails new application_name -d postgresql --heroku my-heroku-app

This fixes #2859
26ff71f
@parndt parndt Added Ruby version and rails_12factor for Heroku installations b79b032
@parndt parndt Fixed indentation of pg gem for production group with Heroku 0c17874
@parndt parndt Also seed Heroku when using the --heroku flag. 4f8c298
Commits on Jan 27, 2015
@parndt parndt Tidied up whitespace bc5f626
@parndt parndt Changed default Heroku stack to cedar-14 611daa1
@parndt parndt Trial adding a Heroku Procfile that uses Puma. 59ef15b
@parndt parndt Switched back to the master branch for merging 3f9b246
@anitagraham anitagraham Shared context/Shared example specs for images 2d4f82c
@anitagraham anitagraham Delete old file 7ad6ca6
@parndt parndt Switched to decorators version 2.0.0
This is due to parndt/decorators#11
8dc31e9
@parndt parndt Merge pull request #2864 from refinery/decorators-upgrade
Switched to decorators version 2.0.0
d0b04d2
@gwagener gwagener Fixed outdated comment. 6461401
@simi simi Clean mounted_path in pages admin features. 7bd22c8
Commits on Jan 28, 2015
@parndt parndt Merge pull request #2866 from refinery/clean-mounted-path-in-page-spec
Clean mounted_path in pages admin features.
357b86b
@parndt parndt Merge pull request #2862 from anitagraham/ImageSpecPart4
Image spec part4
0002226
Commits on Jan 29, 2015
@bricesanchez bricesanchez i18n locale label in locale_picker partial 968a5bd
@parndt parndt Merge pull request #2874 from bricesanchez/locale-picker-i18n-label
i18n locale label in locale_picker partial
e27d51f
Commits on Jan 30, 2015
@simi simi Merge pull request #2861 from refinery/template_test
Improved Heroku support, including using dragonfly-s3_data_store only when needed.
4a0100d
Commits on Feb 05, 2015
@simi simi Generate strong params for engine admin controller. bab2862
Commits on Feb 06, 2015
@parndt parndt Merge pull request #2878 from refinery/generate-params-for-engine
Generate strong params for engine admin controller.
11f8d1e
Commits on Feb 09, 2015
@bricesanchez bricesanchez Add conditionnal clear on before and after inclusion procs cee696e
Commits on Feb 10, 2015
@djones djones Happy 2015 everyone. Updated Copyright year and Resolve's website a80919f
@simi simi Merge pull request #2884 from djones/master
Happy 2015 everyone
76beee4
Commits on Feb 14, 2015
@simi simi Merge pull request #2883 from bricesanchez/fix-2844
Add conditionnal clear on before and after inclusion procs
2c49dde
Commits on Feb 15, 2015
@parndt parndt Content page should only show draft when actually draft. 0c3ab88
@simi simi run CI headless 473af2c
@parndt parndt Merge pull request #2888 from refinery/no-xvfb
run CI headless
ac057c8
Commits on Feb 16, 2015
@parndt parndt Fixed SCSS deprecation warning:
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename core/app/assets/stylesheets/refinery/_mixins.css.scss to core/app/assets/stylesheets/refinery/_mixins.scss
819a960
@parndt parndt Fixed duplicate :class key. 7aa96ec
@anitagraham anitagraham Remove source of factory duplication
Factory_girl_rails was loading factories, and further down in this file
so was refinery.
3ce3fb0
@simi simi Merge pull request #2892 from refinery/rename-css-scss-to-scss
Fixed SCSS deprecation warning:
d9998ac
@parndt parndt Merge pull request #2893 from anitagraham/duplicatefactories
Remove source of factory duplication
b803d39
@parndt parndt Updated stylesheet glob to match plain scss files. fd9f080
Commits on Feb 17, 2015
@parndt parndt Removed hard dependency on Bundler.. not sure it's required.
bc65765
@simi simi Merge pull request #2895 from refinery/is-bundler-required-for-gem
Removed hard dependency on Bundler.. not sure it's required.
6a3fb0a
Commits on Feb 18, 2015
@parndt parndt Forms should generate urls with /new at the end.
Fixes #2896
411c3e6
@simi simi Indent engine generator spec. 6282609
@simi simi Use column names for generated strong parameters in engines.
24ce14e
@parndt parndt Merge pull request #2902 from refinery/fix-resource-params
fix strong params generation in engine generator

Fixes #2901
fec017a
@simi simi Merge pull request #2897 from refinery/fix-2896
Forms should generate urls with /new at the end.
a7dabb0
@simi simi Merge pull request #2886 from refinery/content-page-draft
Content page should only show draft when actually draft.
f8062c3
Commits on Feb 19, 2015
@parndt parndt Support Globalize versions 4.0.0 -> 5.0.0.
5.0.0 contains support for Rails 4.2
4.0.0 contains support for Rails 4.0 and 4.1
cfd759c
@simi simi use custom fork of routing-filter for Rails 4.2 compat 8e10ec0
@simi simi Assert html as xml in page presenter specs. 8422040
@simi simi update friendly_id to 5.1.0 b8d4e4a
@simi simi Move HtmlHelpers to spec/ and use it in core specs also. fe45b8d
@parndt parndt Don't build translations if missing when checking if translations exist. cf4a368
@simi simi Use routing-filter gem.
5816a55
@parndt parndt Fixes issue where page couldn't be found if the parent's path is just…
… an id.
33f8333
@parndt parndt Use redo to avoid a flaky test failure.
523f97b
@simi simi Merge pull request #2889 from refinery/rails-4-2
Rails 4.2 support
6d008dc
@bricesanchez bricesanchez Update friendly_id to fix #2904 3534c48
@parndt parndt Merge pull request #2905 from bricesanchez/friendly_id_update
Update friendly_id to fix #2904
26e113c
Commits on Feb 24, 2015
@parndt parndt Spruced up the 'ol thing. 3ee6e05
@johanb johanb Fix sizing of white container without scrollbars 30ab64a
@parndt parndt Only full-height the #admin_container, not #login_container 1d87c08
@parndt parndt Prevent application of negative margins in admin dialogues
fa3f0b6
Commits on Feb 26, 2015
@parndt parndt Test out a hack to always find many windows. ca14052
Commits on Mar 03, 2015
@ratanachai ratanachai Add guide to use StaffMember.friendly.find 09d7e11
Commits on Mar 04, 2015
@parndt parndt Corrected S3 instructions to include dragonfly-s3_data_store c32e670
@LouisStAmour LouisStAmour If link_url set, Page.url (refinery.url_for) prefixes locale to URLs …
…despite Refinery::I18n.url_filter_enabled = false
1ee6e8f
Commits on Mar 07, 2015
@anitagraham anitagraham Limit propagation of new part name/link
Between creation of new page part and save of page with new part, the
other editor tabs would have the link to the new page part added to
their content area.

This fix ensures the link is only added to the page tabs.
b5aa61e
Commits on Mar 08, 2015
@anitagraham anitagraham handle the return from delete_page_part 4d4ce0b
@parndt parndt Merge pull request #2914 from LouisStAmour/patch-1
If link_url set, Page.url (refinery.url_for) prefixes locale to URLs despite Refinery::I18n.url_filter_enabled = false
6713874
@parndt parndt Merge pull request #2919 from anitagraham/deletePagePartResponse
Handle the response from delete_page_part
e437b08
Commits on Mar 09, 2015
@anitagraham anitagraham minimize change d782fcf
Commits on Mar 10, 2015
@ollaollu ollaollu Update 2 - Amazon S3 for Uploads.textile
Added a direct override for the for the S3 configuration in the core.rb file if the ones in application.rb and environments/production.rb don't solve the problem as was the situation with me.
19b55c5
@parndt parndt Merge remote-tracking branch 'ollaollu/master' 76c1739
@parndt parndt Expose S3 configuration more directly, per #2921
adf85d0
Commits on Mar 11, 2015
@parndt parndt Merge pull request #2923 from refinery/s3-doc-update
S3 doc update
b26a527
@parndt parndt Merge pull request #2918 from anitagraham/ppNamePropagation
Limit propagation of new part name/link for  #2917
a0d8052
@parndt parndt Switched site bar background gradient for a solid colour
215aabb
Commits on Mar 13, 2015
@ngonzalez ngonzalez Resources: Use permitted params, allow method to be overridden a99cb67
Commits on Mar 14, 2015
@CJBrew CJBrew Apply fix to controller macros suggested by parndt
- to remove deprecation warnings in rspec run
abf46fd
@CJBrew CJBrew Make dummy controller work without deprecation warnings f076a8d
Commits on Mar 15, 2015
@CJBrew CJBrew Add routes for running the CrudDummyController tests ffedc9d
Commits on Mar 16, 2015
@parndt parndt Merge pull request #2928 from CJBrew/FixUseRoute
Apply fix to controller macros suggested by parndt
c8d8680
Commits on Mar 19, 2015
@parndt parndt Fix menu links to absolute URLs.
b4845ac
@parndt parndt Merge pull request #2933 from refinery/fix-absolute-page-urls
Fix menu links to absolute URLs.
d1e6eb1
Commits on Mar 20, 2015
@ngonzalez ngonzalez Resources: Update resource_params, integrate changes requested by @pa…
…rndt -- update only supports a single file, create supports many.
2c88590
@parndt parndt Merge pull request #2925 from ngonzalez/master
Resources: Use permitted params, allow method to be overridden
0acf931
@parndt parndt Merge pull request #2924 from refinery/design/site-bar-solid-background
Switched site bar background gradient for a solid colour
139c6b9
Commits on Mar 21, 2015
@parndt parndt Restyled big orange site bar buttons to remove orange.
9a421e8
Commits on Mar 25, 2015
@parndt parndt Merge pull request #2935 from refinery/design/flat
Restyled big orange site bar buttons to remove orange.
ca100e1
Commits on Apr 08, 2015
@bricesanchez bricesanchez Add form extra fields for more options 51b86ac
@parndt parndt Merge pull request #2943 from bricesanchez/form_extra_fields_for_more…
…_options

Add form extra fields for more options
c86551d
Commits on Apr 09, 2015
@bricesanchez bricesanchez Add #2943 PR in changelog
ddb3377
@simi simi Merge pull request #2944 from refinery/changelog-2943-entry
Add #2943 PR in changelog
1a82784
@simi simi Move refinerycms executable to exe/.
8c86981
@simi simi Revert "Merge pull request #2928 from CJBrew/FixUseRoute"
This reverts commit c8d8680, reversing
changes made to a0d8052.
96e5c78
@simi simi Use engine routes in refinerycms specs.
9bfb61e
@simi simi Use custom capture implementation in tests.
2288502
@parndt parndt Merge pull request #2945 from refinery/exe
Move refinerycms executable to exe/.
126297a
@parndt parndt Merge pull request #2946 from refinery/use-engine-routes-in-specs
Use engine routes in specs.
04cc80f
Commits on Apr 11, 2015
@parndt parndt Added rspec-retry to avoid CI failures for timing issues.
85dd8c3
@simi simi Merge pull request #2949 from refinery/rspec-retry
Added rspec-retry to avoid CI failures for timing issues.
9239c9d
Commits on Apr 13, 2015
@parndt parndt Merge pull request #2947 from refinery/custom-capture
Use custom capture implementation in tests.
d6d92b6
Commits on Apr 14, 2015
@ghoppe ghoppe Strong parameters in controller for generated refinery forms 2e6bb6c
@anitagraham anitagraham Specs for #2936 235af3c
Commits on Apr 15, 2015
@simi simi Introduce Refinery::Generators::NamedBase to solve various problems.
66b3453
@simi simi Merge pull request #2951 from refinery/refinery-named-base
Introduce Refinery::Generators::NamedBase to solve various problems.
39a4306
Commits on Apr 21, 2015
@bricesanchez bricesanchez Update guide Menu Presenter for Refinery 3.0 [ci skip]
Remove workaround for show_in_footer param, useless since decorators 2.0,0

Fix typo in menu decorator. Thanks @anitagraham
23b1c7c
@anitagraham anitagraham Ignore .orig files 09d62ab
@anitagraham anitagraham Stage one of using icon font font-awesome
Basic CSS changes to use icons.
Icon colours and sizes not changed (except for accept and close)
Replaced icons in views
Add colours. Class-ify page actions
Change link_to to action_icon or action_label
Add fonts to vendor
Use SCSS partials and @import them.
Use action_label for view switching
3b1e300
@anitagraham anitagraham Implement long-lost login spinner
Nicer green
Snug page-part controls up to top border
trigger clicks on links which poltergeist can’t see

Use iconfont font-awesome to replace individual icon.png files

Basic CSS changes to use icons.
Icon colours and sizes not changed (except for accept and close)
Replaced icons in views
Add colours. Class-ify page actions

Change link_to to action_icon or action_label

Add fonts to vendor
Use SCSS partials and @import them.

Use action_label for view switching

Most icons will be grey, apart from Error/Deletes

Add sort down, sortup icons (although not yet used as a class)
Make draft page check box float to the right
Make locale marker tests see the new markers

Convert generators to icons

Icons have no decorations
be21e54
@anitagraham anitagraham Site_bar isn't a backend partial. 800c796
@anitagraham anitagraham Ensure fonts served from assets pipeline
1. add fonts to precompiled assets
2. put fonts in correct directories
3. set font-path
648190d
@anitagraham anitagraham Css tweaks to borders and padding
1. Fix bottom borders, but clamp down on text-decoration!

2. Padding for icon images not needed.
967c237
@anitagraham anitagraham Appearance changes
Make all icons dark grey
Refine blue colours so they are all related.
4c626a0
@anitagraham anitagraham Page part controls placement
Removed right margin from icon mixing.
37e97f0
@anitagraham anitagraham Returned the 0.3em right margin to the icons
Change images_spec, resources_spec and pages_spec to use
find().trigger(:click) where required.
Added js: true where required.
More descriptive names for some tests

Added poltergeist debug option to spec_helper

Added semi-colons to admin.js.erb to stop error marks appearing.
ddeddf4
@anitagraham anitagraham Use .ignore_hidden_elements false to see hidden textarea
Also fiddle with icon margin again.
f4bb82a
@anitagraham anitagraham Added icons accidentally omitted 0ad8a02
@anitagraham anitagraham Use full iconset
1. Use full iconset
2. Hover effect on icons changed to size+
b05e012
Commits on Apr 22, 2015
@anitagraham anitagraham Merge pull request #2957 from refinery/iconfont-by-anita
Iconfont for real
c4c94cc
Commits on Apr 23, 2015
@parndt parndt Added rake refinery:override:list command.
To see usage, run rake refinery:override:list with no parameters.

Basics:
rake refinery:override:list presenter=pages/title
=> refinery/pages/title_section_presenter.rb

rake refinery:override:list type=view
=> *ALL VIEWS*
29ae592
@awagener awagener Merge pull request #2958 from refinery/feature/rake-refinery-override…
…-list

Added rake refinery:override:list command.
17e6857
@parndt parndt Added Refinery::Admin::PagesController#permitted_page_params and inst…
…ructions to use it.
21b311c
Commits on Apr 24, 2015
@bricesanchez bricesanchez Merge pull request #2953 from refinery/update-guide-menu-presenter
Update guide Menu Presenter for Refinery 3.0
9c7a7f2
Commits on Apr 29, 2015
@anitagraham anitagraham Assets to be precompiled specified in engine.rb
Also fix padding for flash message.
Don’t lowercase the close message
Remove bottom border from close message

Closes #2959
Closes #2961
fecfdc5
@anitagraham anitagraham Add mini-guide for troubleshooting images 22b14cb
@parndt parndt Merge pull request #2962 from anitagraham/troubleshoot_dragonfly
Add mini-guide for troubleshooting images
e34b462
Commits on May 03, 2015
@parndt parndt Fixed bugs: extra ) and incorrect variable.
This was from 3b1e300
09fdb82
Commits on May 04, 2015
@anitagraham anitagraham Fix resource-picker to use icons correctly 83d54d3
Commits on May 05, 2015
@anitagraham anitagraham Remove hover effect from icons 9df54fb
@parndt parndt Merge pull request #2970 from anitagraham/iconfont-hover
Remove hover effect from icons
0826f01
@anitagraham anitagraham Use action-icon in generated views
Closes #2969
52c4eb5
@parndt parndt Merge remote-tracking branch 'anitagraham/resource-picker' d3fee2f
@parndt parndt Minor syntax/cleanup d953a80
Commits on May 06, 2015
@Andrekra Andrekra add missing dutch translation keys 456f700
@simi simi Merge pull request #2971 from Andrekra/fix/devise_authentication_tran…
…slation_dutch

add missing dutch translation keys
eac6ea0
@mhtremblay mhtremblay alignment correction 3ced4c1
@parndt parndt Merge pull request #2972 from mhtremblay/patch-1
alignment correction
a1e295b
Commits on May 07, 2015
@johanb johanb Prevent crash if a user has no plugin's yet and you want to assign some. 75e670a
@johanb johanb Remove unneeded code
After casting the max to_i we no longer need to check wether or not there are any plugins
dc60967
@johanb johanb Spec that each new plugin actually gets a unique position starting fr…
…om 1
a367d64
@johanb johanb Allow a user to have 0 plugins 9b4614b
@johanb johanb Spec the fixed behavior 0d0815f
@darmens darmens Italian locales updated 1af972f
@johanb johanb Remove action_view form extensions that provide trivial functionality…
… and don't adhere to Rails' default i18n behavior.

Discussed here: #2954 (comment)

Closes #2954
b4b20cd
@parndt parndt Merge pull request #2974 from johanb/master
Prevent crash if a user has no plugin's yet and you want to assign some.
83b7259
@parndt parndt Fixed up some whitespace & indentation.
Also switched marketable_page_path with marketable_page_url.
This is to ensure that we're testing more cases, as well as
that Rails has deprecated calling a path helper with an
:only_path parameter.
f832b5f
Commits on May 08, 2015
@simi simi Merge pull request #2976 from darmens/master
Italian locales updated
e0e91a9
Commits on May 09, 2015
@parndt parndt Merge pull request #2975 from johanb/allow_0_plugins
Allow a user to have 0 plugins
375a235
@parndt parndt Revert try to conditional 441d605
@anitagraham anitagraham Use remove on resource-picker, not delete
the action ‘delete’ uses the delete method.
Remove in this situation triggers javascript and leaves the unlinking
of the resource until ‘Save’ happens.
Using an ‘unlink’ icon instead of the standard delete.
4a39083
Commits on May 11, 2015
@parndt parndt Merge pull request #2977 from anitagraham/resource-picker-remove
Use remove on resource-picker, not delete
7f90021
Commits on May 13, 2015
Brandon Joyce change 'extend' to 'include' [ci skip] 407d23e
Brandon Joyce Removing order by 'lft' dfd77c8
@parndt parndt Merge pull request #2978 from BrandonJoyce356/documentation-fix
change 'extend' to 'include'
c80ade8
Commits on May 19, 2015
@parndt parndt Removed double mention of change fedc2bb
Commits on May 20, 2015
Brandon Joyce Adding spec for reording pages 230b218
@parndt parndt Merge pull request #2981 from BrandonJoyce356/sql-server-order-by-fix
Fixing SQL Server Order By Error
fdd9b82
Commits on May 21, 2015
@mhtremblay mhtremblay Prevent double border on file ressource picker 2569039
@bricesanchez bricesanchez Merge pull request #2984 from mhtremblay/patch-2
Prevent double border on file ressource picker
5213243
Commits on May 25, 2015
@anitagraham anitagraham Use strong params on generated settings_controller 3e20028