Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update browsercms #9

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
fd803f0
Only make the CMS form builder the default for CMS controllers
Mar 6, 2014
32ba1fc
fix sidebar for content edit view - use namespace prefix with routing…
Mar 7, 2014
08851e6
use named wrapper config for simple_form
Mar 7, 2014
1ce475c
Adjusting jquery precompile include
Mar 10, 2014
80c2ad4
[Fixes #657] Can no longer delete homepage.
peakpg Mar 11, 2014
760d7ce
[Fixes #556] Templates uniqueness for names
peakpg Mar 11, 2014
1218bcc
Merge pull request #704 from jamesprior/master
peakpg Mar 11, 2014
00f6335
[Fix for #703] Add cms_form_for
peakpg Mar 11, 2014
6eb76b2
Merge pull request #702 from andyoll/use_browsercms_wrapper_config_fo…
peakpg Mar 11, 2014
a2eda14
Merge pull request #701 from andyoll/use_cms_namespace_on_path
peakpg Mar 11, 2014
e1009d5
Link to fixed bugs
peakpg Mar 11, 2014
f67eac2
Fix searching and pagination
jamesprior Apr 22, 2014
03aff3f
[Fix #723] Deleting Form Entries works
peakpg Jul 16, 2014
5238d8a
[Fixes #724] Allow pagination to work with any model
peakpg Jul 18, 2014
c76b4f5
Merge pull request #719 from jamesprior/patch-1
peakpg Jul 18, 2014
88c03d2
Merge Search Param fix
peakpg Jul 18, 2014
faeeeab
[Fixes #726] Allow search to work for Form Entries
peakpg Jul 18, 2014
7ca0b45
Fix issue where paging/search threw an error for project specific blocks
peakpg Jul 22, 2014
863c95a
Disable browser caching for entire CMS to avoid users submitting or s…
peakpg Jul 30, 2014
da18941
add paperclip 3.4.1 to Gemfile
britneywright Sep 18, 2014
21994cc
Merge pull request #738 from britneywright/paperclip-3-4-1
peakpg Sep 30, 2014
8e98a8c
Loose dependency on paperclip to allow for older versions as needed. …
Sep 30, 2014
d654557
Bump for RC1 status
peakpg Sep 30, 2014
38f7fe0
Fixes 4.0.0.rc1 tests
jtwohiou Mar 13, 2017
bf8a9d7
Removes growlnotify
jtwohiou Mar 13, 2017
9cf2655
fixes minitest issue
jtwohiou Mar 13, 2017
4a5ab62
Updates cucuber-rails to 1.4.1 for rails 4 support
jtwohiou Mar 13, 2017
1f86849
stuff
jtwohiou Mar 14, 2017
6c6fa07
Fixes validation errors for 4.2 upgrade
jtwohiou Mar 14, 2017
83e8394
Fixes first active model dirty rails 3 issues
jtwohiou Mar 14, 2017
7bf1256
Fixes active model dirty modification
jtwohiou Mar 14, 2017
7fcd8ad
Updates arel call to arel 6.0.0
jtwohiou Mar 15, 2017
da664f5
Forward thinking for rails 5 regarding migrations
jtwohiou Mar 15, 2017
f76384a
prep for rails 5 test order
jtwohiou Mar 16, 2017
0639393
Fixes attachment versioning and email tests
jtwohiou Mar 16, 2017
df2f88d
begins fixing unit tests
jtwohiou Mar 17, 2017
7d03cfd
More test fixes
jtwohiou Mar 17, 2017
1a17d48
more test fixes
jtwohiou Mar 19, 2017
afc0cca
Continues fixing tests.
jtwohiou Mar 20, 2017
7314a8b
resolves more tests
jtwohiou Mar 23, 2017
a606b13
Updates bcms to ruby 2.3
jtwohiou Mar 26, 2017
e3436b5
Merge pull request #757 from browsermedia/4.0.0_test
jtwohiou Mar 29, 2017
e174bc7
first crack at rails 5
jtwohiou Mar 29, 2017
f6ae39e
Updates travis config for ruby 2.3
jtwohiou Apr 4, 2017
0a85d8a
Removes arel from publishing call and replaces with update_all avoidi…
jtwohiou Apr 8, 2017
6e32883
Removes deprecation warning on content controller
jtwohiou Apr 8, 2017
a24bb32
solves more deprecation issues (needs to be revisited)
jtwohiou Apr 11, 2017
7773d3c
Merge pull request #758 from browsermedia/rails4.2
jtwohiou May 12, 2017
15e7305
Merge pull request #759 from browsermedia/rails5.0.2
jtwohiou May 12, 2017
196e9e0
Fixes search attributes
jtwohiou Aug 8, 2017
73910d3
fixes icon size and handles missing search params
jtwohiou Aug 11, 2017
ae527cd
fixes ordering of content blocks
jtwohiou Aug 12, 2017
dd4b96e
Fixes ckeditor load failure
jtwohiou Aug 12, 2017
0a7fb92
Adds missing jquery ui css
jtwohiou Aug 12, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-gemset
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rails_4.0
browsercms
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- "2.0.0"
- "2.3.0"
# - "1.9.2"
# uncomment this line if your project needs to run something other than `rake`:
# script: bundle exec rspec spec
Expand Down
21 changes: 15 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

ruby '2.0.0'
ruby '2.3.0'

# Load this project as a gem.
gemspec
Expand All @@ -12,34 +12,43 @@ gem 'bluecloth', :groups=>[:development, :test] # For YARD

gem "thin" # To avoid annoying Ruby 1.9.3/Rails/Webrick warnings - See http://stackoverflow.com/questions/7082364/what-does-warn-could-not-determine-content-length-of-response-body-mean-and-h

gem 'sass-rails', '~>5.0.0'
gem 'sprockets-rails', '~>2.3.1'

# Uncomment to confirm that older versions work (for compaitiblity with Spree 2.2.4/bcms_spree)
# gem 'paperclip', '~> 3.4.1'
# For testing behavior in production
group :production do
gem 'uglifier'
end

group :development do
gem 'rake'
gem 'debugger'
gem 'quiet_assets'
# gem 'debugger'
gem 'better_errors'
gem 'binding_of_caller'
gem 'pry'
end
group :test, :development do
gem 'minitest'
gem "test-unit", "~> 3.0"
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'minitest-reporters', '~>1.0.0'
gem 'rails-controller-testing'
end

group :test do
gem 'poltergeist'
gem 'm', '~> 1.2'

gem 'single_test'
gem 'factory_girl_rails', '3.3.0'
gem "mocha", :require=>false
gem "sqlite3-ruby", :require => "sqlite3"

# Cucumber and dependencies
gem 'capybara'
gem 'database_cleaner'
gem 'cucumber-rails', :require=> false
gem 'cucumber-rails', '~> 1.4.1', :require=> false
gem 'cucumber'
gem 'launchy'
gem 'ruby-prof'
Expand Down
Loading