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.

Sign up for GitHub

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

Master #122

Open
wants to merge 366 commits into
base: Master
Choose a base branch
from
Open

Master #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
366 commits
Select commit Hold shift + click to select a range
7920924
updated
Jan 2, 2012
c360354
Utilize a package folder for theme management.
Jan 2, 2012
ae08002
updated
Jan 2, 2012
ca8d039
added remove item icon/function to view cart page.
Jan 2, 2012
e86b9ce
updated
Jan 2, 2012
f3baf9f
added language line for no bulk products selected error.
Jan 2, 2012
48c7d49
irrelevant file.
Jan 3, 2012
12f32d7
OOPS! sql file wasn't returning as data!
Jan 3, 2012
2344de4
Added gift card enabled checking to view cart page.
Jan 6, 2012
555f202
fixed missing language line
Jan 6, 2012
ec016ee
homepage box function did not properly exclude disabled boxes.
Jan 6, 2012
5f139b0
updated
Jan 6, 2012
912e207
updated location of page title
Jan 6, 2012
58dc281
removed in_stock from get_cart_ready_product function
Jan 9, 2012
241b1b2
update support for inventory in go-cart library
Jan 10, 2012
6035d3a
add in quantity deduction to go-cart library
Jan 10, 2012
cf873a6
added download initializer in go-cart library
Jan 10, 2012
c9ae325
updated checkout view to look at the correct path for including the h…
Jan 10, 2012
a6fb76b
Fixed downloads bug
Jan 10, 2012
d1f9a71
fixed payment a bug associated with free orders
Jan 10, 2012
08b416b
Fixed payment option behavior on checkout
Jan 10, 2012
5430bdd
updated add-this code to remove https variable need
Jan 10, 2012
0836b82
added bool check for "check stock" field in product database
Jan 10, 2012
a837554
Fixed table rate module bug, broken row adders
Jan 11, 2012
062382b
Fixed customers / orders XML export
Jan 11, 2012
830f54f
Fixed errors in the digital products admin section
Jan 11, 2012
e640f43
Gift cards were broken
Jan 12, 2012
1cf45a4
Checkout payment behavior was still not right under certain conditions
Jan 15, 2012
1a0c56f
Update changelog.txt
Jan 16, 2012
c949edc
Update version
Jan 16, 2012
b71d107
Update changelog.txt
Jan 16, 2012
c7776f1
Boxes we're only loading 1 at a time. we had an operator reversed.
Jan 17, 2012
bcaac2b
updated folder path to a folder that actually exists.
Jan 20, 2012
1e6f114
updated reference to the digital uploads folder
Jan 20, 2012
86f9c3a
Added track_stock to get cart_ready_product function
Jan 20, 2012
64bf08b
updated
Jan 20, 2012
da1a6a5
fixed gift card check in checkout.php controller
Jan 20, 2012
a42697c
fixed a bug that was stopping quantity from being updated if allow ov…
Jan 22, 2012
8bc2fc0
updated
Jan 22, 2012
25be83e
updated
Jan 30, 2012
447d8a5
updated
Jan 30, 2012
50066d2
fixed count_product which was stopping pagination on category pages
Jan 30, 2012
553c9aa
updated
Jan 30, 2012
19df647
Fixed giftcard errors
Feb 10, 2012
445d021
product sorting worked on the back end but was ignored on the front end.
Feb 10, 2012
6fd39f7
My Account page was pulling customer data from go-cart lib instead of…
Feb 13, 2012
10abdf8
updated
Feb 13, 2012
f445f51
Eliminated depreciated $this->encrypt->sha1 references.
Feb 13, 2012
a9872b8
udpated
Feb 13, 2012
c981393
Fixes undefined index error if Customer ID does not exist. (svizion)
Feb 23, 2012
455097c
updated
Feb 23, 2012
fed9b67
updated
Feb 23, 2012
0428488
updated
Feb 23, 2012
88c2afa
updated
Feb 23, 2012
3f6d4f7
fixed track_stock flag on gift cards and is_gc flag on products
Mar 8, 2012
037f0b1
updated
Mar 8, 2012
f385239
updated
Mar 8, 2012
4a82132
Fixed blank search term error.
Mar 15, 2012
b925501
fixed is_gc flag error in admin order view
Mar 22, 2012
3a3022f
continued update to fix is_gc error
Mar 22, 2012
3e18e93
Updated default uri_protocol to AUTO since that should be default fr…
Apr 9, 2012
ee54f1e
Louisiana had a default tax of of %4 this has been reset to 0
Apr 9, 2012
b24aebe
fixed colspan on the empty product table in admin.
Apr 9, 2012
0d1e665
updated
Apr 9, 2012
d29cfa7
stopped US domestic rates from appearing for Intl. orders
Apr 10, 2012
ae99186
Changed several default $id values from false to null
Apr 10, 2012
86fc78b
Fixed missing title and meta data when no SEO title or meta set
Apr 11, 2012
5c5721b
Fixed quantity items were updating quantity if additional items were …
Apr 11, 2012
1bc1956
Fixed date picker javascript to display the appropriate field.
Apr 12, 2012
0772b8e
fixed get_homepage_banners function to properly remove disabled banners
Apr 12, 2012
b2de876
updated
Apr 12, 2012
58cbbc4
fixed variable name
Apr 12, 2012
cb77708
Fixed the date fields to properly save on boxes
Apr 12, 2012
e1df516
Merge pull request #23 from pro1/bugfixes
Apr 13, 2012
e387556
updated
Apr 13, 2012
e4a5c0c
pagination fixes for sites using index.php
Apr 13, 2012
5b8f7d9
Fixed login redirect for expired customer sessions (thanks Dinesh)
Apr 19, 2012
ac8c7e4
updated
Apr 19, 2012
4e918fb
Fixed admin order list pagination
May 2, 2012
79a80b1
partial admin order pagination fix
May 3, 2012
d0c4dd5
Load the payment module even if they don't owe anything. This is beca…
May 7, 2012
6f91bba
PHP error fix for admin order view related to product code.
May 11, 2012
cdd8224
Updated CodeIgniter to 2.1.1
og-shawn-crigger Jun 19, 2012
9208545
Merge pull request #28 from svizion/Development
Jun 19, 2012
ea34cf7
Updated to SQL session query to support ipv6 length
Jun 20, 2012
2883876
updated
Jun 20, 2012
7cfb9d3
updated index.php to CI 2.1.1
Jun 20, 2012
1dc970e
Update to GoCart 2.0 Dev
Jun 22, 2012
62a1497
updated
Jun 22, 2012
9ee104f
Fix no search term error
Jun 27, 2012
1de6985
updated customer pagination config.
Jul 12, 2012
82398ad
Removed unused constructor
Jul 23, 2012
909c067
Removed unused constructor
Jul 23, 2012
2463a2b
Eliminated some functions that were used from testing and uncommented…
Jul 23, 2012
3ef9f03
Fixed error class for the bootstrap theme.
Jul 23, 2012
0c92f0c
When viewing a page that does not exist by direct url we throw a 404
Jul 23, 2012
e33b37c
Fixed option errors in product_form.php view
Jul 23, 2012
69a256c
Fixed bad return if the row does not exist
Jul 24, 2012
d50f634
Fixed taxable shipping.
Jul 24, 2012
6572ebc
Fixed bug where taxes break when totalling more than 999
Jul 26, 2012
e87b953
Force checkout to see if a post code is required before automatically…
Jul 26, 2012
b168e43
Fixer typo that caused PHP errors in the admin form.
Jul 26, 2012
69db754
Updated to CodeIgniter 2.1.2
Jul 26, 2012
1785874
Remove erroneously included code and replaced with appropriate paths
Aug 6, 2012
53cdd1b
Fix the ability to completely remove a product from all categories
Aug 9, 2012
39d3688
Update gocart/themes/bootstrap/views/checkout/payment_form.php
Aug 9, 2012
d2c5e1b
Update gocart/models/category_model.php
alessandromangiameli Aug 10, 2012
23969ff
Update gocart/views/admin/category_form.php
alessandromangiameli Aug 10, 2012
1c98e9f
Merge pull request #39 from mangia84/2.0-Development
Aug 10, 2012
75b549f
Escape slug in mysql statement when looking for a route
Aug 11, 2012
ccdd613
Fixed $$ (thanks mangia84)
Aug 11, 2012
8b059be
Remonde old default theme and renamed bootstrap theme to default
Aug 13, 2012
d1aa58e
fixed the page variable from overwriting page content in the header.
Aug 13, 2012
e2b4dc3
Use Active_Record for MY_Router.php (thanks to dixanta)
Aug 16, 2012
e9269a8
Fix issue with the text on the Category tab of the Product Form
Aug 25, 2012
2421ed7
Merge pull request #48 from seandowney/2.0-Dev-ProductForm
Aug 30, 2012
bd02d07
moved download_package array out of the item loop.
Aug 30, 2012
b884382
Added xss filter to search term.
Aug 30, 2012
914b0ba
Fix sorting by price when sales prices are present
Sep 7, 2012
2e5adc9
eliminated unused heard_about field, removed tabs
Sep 11, 2012
3bf3446
bugfix for cartkey not defined error (thanks mxpr)
Sep 11, 2012
d481035
removed unused function.
Sep 11, 2012
5cb949b
Removed file that was not in use.
Sep 11, 2012
d286fef
cleaned up and extended the formatting helper
Sep 11, 2012
5d18c14
Removed unused function
Sep 11, 2012
5310b57
Continued elimination of utility helper
Sep 12, 2012
82cf1ac
Updated format address to support a br separator
Sep 12, 2012
ec4d023
update order placed to use the format_address function
Sep 12, 2012
74c7cf4
Updated to use format_address function
Sep 12, 2012
d1c07aa
updated to use new flag on format_address
Sep 12, 2012
af1988c
removed reference to utility helper
Sep 12, 2012
86bb15e
eliminate reference to utility helper
Sep 12, 2012
32f02bc
made the trash button smaller.
Sep 12, 2012
a3e2895
No idea where that file came from...
Sep 12, 2012
9775ff5
Eliminated unused files
Sep 12, 2012
74e0a3e
Eliminated unused files and uploaded new admin files.
Sep 12, 2012
ff3090f
updated logo path
Sep 12, 2012
a6b0d65
Media manager controller for new wysiwyg editor
Sep 12, 2012
5bb8b6f
Update admin files to reflect new WYSIWYG
Sep 12, 2012
9a5abe4
Removed unused files and updated locations for others
Sep 12, 2012
79ecd3a
add language file for wysiwyg
Sep 12, 2012
1234fa1
updated
Sep 12, 2012
d52a30a
updated
Sep 12, 2012
f14cf56
updated install view to use twitter bootstrap
Sep 12, 2012
f090f03
fixed colspan on empty lists
Sep 12, 2012
9935b3d
Update version
Sep 13, 2012
355e091
Update changelog.txt
Sep 13, 2012
3bba808
Add migrations for GoCart 2.0 db changes
Sep 13, 2012
172b03c
new file
Sep 13, 2012
47a282e
updated
Sep 13, 2012
814d9e0
Add migrations for GoCart 2.0 db changes
Sep 13, 2012
6f38a19
new file
Sep 13, 2012
4adee2e
updated
Sep 13, 2012
93f07f7
my_controller load goedit lang file
Sep 13, 2012
36533b8
Merge branch 'Master' into 2.0-Development
Sep 13, 2012
0ff283b
Fixed a minor bug where if an option has no values we get a PHP error
Sep 13, 2012
87e9755
removed code fragment from previous default theme.
Sep 14, 2012
14a1820
updated
Sep 14, 2012
17d6374
Fixed product view to reflect config track stock choice, and replaced…
Sep 14, 2012
0021b30
Updated MY_Controller to take care of most of the constructor needs.
Sep 17, 2012
269ee6b
Fix allow out of stock checkout.
Sep 17, 2012
6f31620
Better fix for overstock check. No database call required this way.
Sep 17, 2012
c8131a6
missing bracket
Sep 17, 2012
6a10b88
Fix for payments like Paypal Express
Sep 18, 2012
51c9829
Files were not in use.
Sep 21, 2012
3fec098
refs #51 A fix for the Media Manager folder management
Sep 27, 2012
7d67275
Merge pull request #56 from seandowney/feature/issue51_fix
Sep 27, 2012
620de38
Set default SEO title if one is not set (thx olimortimer)
Sep 27, 2012
b78b77e
fixes #54 A change to the header to display the seo title and the com…
Sep 28, 2012
a524ef1
Remove the migrate controller and use auto migration instead
Sep 28, 2012
d2af087
This change allows to destroy the cart session data before the view i…
Sep 29, 2012
536e0d9
Merge pull request #58 from seandowney/feature/automigration
Oct 1, 2012
1e44b1d
Merge pull request #62 from seandowney/feature/order_placed_session
Oct 1, 2012
ec40592
multipage checkout
Oct 9, 2012
9f168c4
added view and partial functions to MY_Controller.php
Oct 9, 2012
abebaa8
update language file for multi-page checkout
Oct 9, 2012
2fe4c80
updated GoCart additional detail code.
Oct 9, 2012
9bb4aca
increased CVV code to 4 characters
Oct 9, 2012
1ed5c26
no longer needed.
Oct 10, 2012
b175664
Check to see if the field exists in migrations before removing it.
Oct 11, 2012
b95edb9
fixed problem with base rates
Oct 29, 2012
6634d51
Fix shipping loop if no shipping options exist
Oct 29, 2012
9345afb
Correct spelling (thx briangelhaus)
Oct 29, 2012
745a25a
update change log
Oct 29, 2012
ffad09b
updated
Oct 29, 2012
c1c494b
updated
Oct 29, 2012
6b21c71
updated
Oct 29, 2012
325f3c6
removed duplicate form_login (thx dronord)
Oct 30, 2012
72b213d
translatable 'Login', 'Register', 'Checkout' on page view_cart
Nov 1, 2012
6b71752
translatable 'Search' in header
Nov 1, 2012
25a48b4
translatable 'Catalog' in header
Nov 1, 2012
0f3fb6c
translatable 'Inventory' on page product_form
Nov 1, 2012
20ce436
translatable 'Home', 'Actions' in admin header
Nov 1, 2012
8b6a87a
translatable 'Account' in frontend header
Nov 1, 2012
b1b5f20
translatable 'Close' in address_form
Nov 1, 2012
73ba834
translatable title 'Search' on page search
Nov 1, 2012
41540ea
Merge pull request #71 from dronord/2.0-Development
Nov 1, 2012
9374a90
fix missing data['error']
dronord Nov 2, 2012
1a624ed
translatable 'Subcategories' on page category
dronord Nov 16, 2012
1f85f30
Fixed install redirect for some servers
Nov 29, 2012
81749ca
updated
Nov 29, 2012
5276720
updated
Nov 29, 2012
f4a4690
Fixed product view checkbox options
Dec 10, 2012
53973b6
updated
Jan 4, 2013
1f490f1
update
Jan 5, 2013
34bafa2
Merge pull request #72 from dronord/2.0-Development
Jan 19, 2013
6b5a5a9
Replace goedit with redactor
Jan 22, 2013
aa39024
update jquery / jquery UI
Jan 22, 2013
97bf3b3
fix some language items
Jan 22, 2013
0c0df9e
make some legacy css classes match the new format
Jan 22, 2013
a0934a3
replace goedit references with redactor
Jan 22, 2013
61f071e
update css classes
Jan 22, 2013
1701630
update css classes and move related products to the bottom for mobile…
Jan 22, 2013
c0eaef5
Merge view cart & checkout summary table
Jan 22, 2013
a638ef6
Fix Firefox bug where the image upload form is hidden.
Jan 22, 2013
401bae2
update
Jan 22, 2013
72f22f6
Update licenses
Jan 23, 2013
ab2f471
Add gocart attribution to footer.
Jan 23, 2013
5d7a432
Update logo on login page.
Jan 23, 2013
18c8c74
Update media manager to work with redactor
Jan 23, 2013
abfa237
Fix for issue #75 (thx abulte)
Jan 23, 2013
65e8755
Added instructional text to installation regarding database
Jan 23, 2013
f3fa087
updated
Jan 23, 2013
7654988
fix missing data['error']
dronord Nov 2, 2012
9c1a7d3
translatable 'Subcategories' on page category
dronord Nov 16, 2012
8e9f80d
Replace goedit with redactor
Jan 22, 2013
2514a44
update jquery / jquery UI
Jan 22, 2013
d5d850e
fix some language items
Jan 22, 2013
a1162b4
make some legacy css classes match the new format
Jan 22, 2013
495fcf5
replace goedit references with redactor
Jan 22, 2013
cc1f2ec
update css classes
Jan 22, 2013
4046220
update css classes and move related products to the bottom for mobile…
Jan 22, 2013
0dad5a4
Merge view cart & checkout summary table
Jan 22, 2013
1c6252d
Fix Firefox bug where the image upload form is hidden.
Jan 22, 2013
83e8bed
update
Jan 22, 2013
dd18279
Update licenses
Jan 23, 2013
da736b9
Add gocart attribution to footer.
Jan 23, 2013
fdb0917
Update logo on login page.
Jan 23, 2013
a128e0f
Update media manager to work with redactor
Jan 23, 2013
bd227ef
Fix for issue #75 (thx abulte)
Jan 23, 2013
a9e48e9
Added instructional text to installation regarding database
Jan 23, 2013
34c0cc3
updated
Jan 23, 2013
2af064d
update to version number
Jan 25, 2013
d143631
Merge branch '2.0-Development' into Master
Jan 25, 2013
5f7a167
Missing bracket in GoCart lib caused some problems!
Jan 25, 2013
db524c6
update
Jan 25, 2013
7b27928
Merge branch '2.0-Development' into Master
Jan 25, 2013
d4e9cda
Translation for Brazilian Portuguese
everlon Apr 12, 2013
6cb36d9
Revert "Translation for Brazilian Portuguese"
everlon Apr 12, 2013
eec998a
Translation for Brazilian Portuguese
everlon Apr 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 17 additions & 1 deletion .gitignore
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
._*
.htaccess
uploads/*
database.php
config.php
gocart.php
*.bak

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
51 changes: 0 additions & 51 deletions CodeIgniter license.txt
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions assets/css/bootstrap-responsive.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions assets/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions assets/css/file-browser.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body .redactor_toolbar li a.redactor_btn_file-browser {
background: url('../img/file-browser.png') no-repeat;
}
5 changes: 5 additions & 0 deletions assets/css/jquery-ui.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading