Skip to content

Commit 0de0dd6

Browse files
committed
Merge branch 'v0.2.2'
2 parents f1a55ca + 7000d43 commit 0de0dd6

File tree

22 files changed

+335
-160
lines changed

22 files changed

+335
-160
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ npm-debug.log
2121
*.sublime-project
2222
*.sublime-workspace
2323

24-
reaction-dev.sh
24+
reaction-dev.sh
25+
packages/*

.meteor/packages

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,28 @@
44
# but you can also edit it by hand.
55

66
# Core Meteor Packages
7-
standard-app-packages
8-
less
9-
coffeescript
10-
jquery
7+
meteor-platform
118
oauth-encryption
9+
coffeescript
10+
less
1211

1312
# Optional Meteor Packages
1413
accounts-facebook
1514
spiderable
1615
force-ssl
1716

17+
# Community Packages
18+
nemo64:bootstrap
19+
#mike:mocha
20+
#anti:fake
21+
#sanjo:jasmine
22+
1823
# Reaction Commerce Packages
24+
reactioncommerce:core-theme
1925
reactioncommerce:core
20-
reactioncommerce:reaction-paypal
2126
reactioncommerce:reaction-google-analytics
22-
reactioncommerce:reaction-helloworld
27+
reactioncommerce:reaction-helloworld
28+
reactioncommerce:reaction-shipping
29+
reactioncommerce:reaction-paypal
30+
reactioncommerce:reaction-braintree
31+
reactioncommerce:reaction-stripe

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+

.meteor/versions

Lines changed: 118 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,131 @@
1-
2-
3-
4-
5-
1+
2+
3+
4+
5+
66
7-
aldeed:autoform@4.0.7
7+
aldeed:autoform@4.2.2
88
99
10-
aldeed:simple-schema@1.1.0
10+
aldeed:simple-schema@1.2.0
1111
1212
13-
14-
15-
16-
17-
18-
19-
20-
21-
22-
23-
24-
25-
26-
27-
28-
29-
30-
31-
32-
33-
34-
35-
36-
37-
38-
39-
40-
41-
13+
14+
15+
16+
17+
18+
19+
20+
21+
22+
23+
24+
25+
26+
27+
28+
29+
30+
31+
32+
33+
34+
35+
36+
37+
38+
39+
40+
41+
42+
43+
4244
43-
44-
45-
46-
45+
46+
4747
48-
49-
50-
51-
52-
53-
54-
55-
56-
57-
58-
59-
60-
61-
62-
63-
64-
65-
66-
67-
68-
69-
70-
71-
72-
48+
49+
50+
51+
52+
53+
54+
55+
56+
57+
fortawesome:[email protected]_2
58+
59+
60+
61+
62+
63+
64+
65+
66+
67+
68+
69+
70+
71+
72+
73+
74+
75+
76+
77+
78+
7379
74-
meteor-platform@1.2.0
75-
meteor@1.1.3
76-
77-
78-
79-
80-
81-
80+
meteor@1.1.4
81+
meteor-platform@1.2.1
82+
83+
84+
85+
86+
87+
8288
89+
90+
8391
8492
85-
86-
87-
88-
89-
90-
91-
93+
94+
95+
96+
97+
98+
99+
100+
101+
92102
93-
94-
reactioncommerce:[email protected]
95-
reactioncommerce:[email protected]
96-
reactioncommerce:[email protected]
97-
reactioncommerce:[email protected]
98-
99-
100-
101-
102-
103+
104+
reactioncommerce:[email protected]
105+
reactioncommerce:[email protected]
106+
reactioncommerce:[email protected]
107+
reactioncommerce:[email protected]
108+
reactioncommerce:[email protected]
109+
reactioncommerce:[email protected]
110+
reactioncommerce:[email protected]
111+
reactioncommerce:[email protected]
112+
113+
114+
115+
116+
103117
104-
105-
106-
107-
108-
109-
110-
111-
112-
113-
114-
115-
116-
117-
118-
118+
119+
120+
121+
122+
123+
124+
125+
126+
127+
128+
129+
130+
131+

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ MAINTAINER Aaron Judd <[email protected]>
1818

1919
# install node + (optional imagemagick for cfs:graphicsmagick)
2020
RUN apt-get update -y && apt-get install --no-install-recommends -y -q curl python gcc make build-essential git ca-certificates nano
21-
RUN mkdir /nodejs && curl http://nodejs.org/dist/v0.10.29/node-v0.10.29-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1
21+
RUN mkdir /nodejs && curl http://nodejs.org/dist/v0.10.33/node-v0.10.33-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1
2222
ENV PATH $PATH:/nodejs/bin
2323

2424
# install imagemagick (optional for cfs:graphicsmagick)

README.md

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
#Reaction Commerce
2-
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/reactioncommerce/reaction?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
3-
A commerce platform developed with Meteor and following a reactive design pattern that puts usability and conversions first.
4-
2+
A commerce platform developed with Meteor, Node.js, MongoDB, CoffeeScript following a reactive design pattern that puts usability and conversions first.
53

6-
---
7-
###Roadmap & Status:
4+
##Roadmap & Status:
85

9-
** Current status: Alpha Preview v0.2.1 **
6+
** Current status: Alpha Preview v0.2.2 **
107
** Functional but unstable, with HEAVY ongoing development!**
118

12-
Currently good for contributing/observing progress, testing. It goes without saying that we're constantly refactoring, even things that are functionally done. Would not recommend for production usage yet, unless you are very comfortable with the code, and aren't risk averse.
9+
Currently good for contributing/observing progress, testing. It goes without saying that we're constantly refactoring, even things that are functionally done. We do not recommend using for production usage yet, unless you are very comfortable with the code, and aren't risk averse. There are still many parts in development!
1310

1411
As with all development, some items are ahead of schedule, and some are not.
1512

@@ -23,10 +20,8 @@ The Docker image is automatically built at the [Ongo Works public Docker repo](h
2320

2421
Your test shops help us in developing [Launchdock](https://github.com/ongoworks/launchdock), the docker container management application we are building to deploy Reaction shops with.
2522

26-
2723
---
28-
###Core ideas:
29-
24+
##Core ideas:
3025

3126
* Fast, clean, and easy to use for end users as well as store owners.
3227
* Full functionality / matching feature sets that you would expect from Magento, Shopify, Spree, etc.
@@ -42,32 +37,45 @@ Your test shops help us in developing [Launchdock](https://github.com/ongoworks/
4237
* Realtime synchronization across platforms/browsers
4338
* Cross platform, responsive focus - should work well natively, without native apps.
4439
* Migration paths from existing commerce platforms (Magento, Shopify, BigCommerce)
45-
* reactioncommerce:core package can be used as a package in any meteor application
40+
* reactioncommerce:core package can be used as a package in meteor applications
4641
* Designer and developer friendly!
4742
* HTML/CSS/Javascript or CoffeeScript knowledge should be sufficient for customization.
4843
* Commercial package and theme development encouraged.
4944
* All contributors should be rewarded. [please contact us](mailto:[email protected])
5045

46+
## Feedback
47+
### GitHub Issues
48+
Our preferred method for Reaction feedback it that you use GitHub issues on the https://github.com/reactioncommerce/reaction project.
49+
50+
### Chat Rooom
51+
Join us on our Gitter chat room, discuss, get help.
52+
53+
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/reactioncommerce/reaction?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
54+
55+
### Google Group
56+
Google group at https://groups.google.com/forum/#!forum/reaction-talk
5157

5258
##Developer Documentation
5359

54-
[Installation](https://github.com/ongoworks/reaction-core/blob/master/docs/installation.md)
60+
[Getting started guide](http://thoughts.reactioncommerce.com/how-to-get-involved-with-reaction-commerce/)
5561

56-
[Guidelines](https://github.com/ongoworks/reaction-core/blob/master/docs/conventions.md)
62+
[Installation](https://github.com/reactioncommerce/reaction-core/blob/master/docs/installation.md)
5763

58-
[Package Development](https://github.com/ongoworks/reaction-core/blob/master/docs/packages.md)
64+
[Guidelines](https://github.com/reactioncommerce/reaction-core/blob/master/docs/conventions.md)
5965

60-
[Theme Development](https://github.com/ongoworks/reaction-core/blob/master/docs/themes.md)
66+
[Package Development](https://github.com/reactioncommerce/reaction-core/blob/master/docs/packages.md)
6167

62-
[i18n Translations](https://github.com/ongoworks/reaction-core/blob/master/docs/i18n.md)
68+
[Theme Development](https://github.com/reactioncommerce/reaction-core/blob/master/docs/themes.md)
6369

64-
[Template Development](https://github.com/ongoworks/reaction-core/blob/master/docs/templates.md)
70+
[i18n Translations](https://github.com/reactioncommerce/reaction-core/blob/master/docs/i18n.md)
6571

72+
[Template Development](https://github.com/reactioncommerce/reaction-core/blob/master/docs/templates.md)
6673

67-
## Code Repositories
68-
Hey! Where's all the code!? Most of it is in the [reaction-core](https://github.com/ongoworks/reaction-core/) package...
6974

75+
### Code Repositories
76+
Hey! Where's all the code!? Most of it is in the [reaction-core](https://github.com/reactioncommerce/reaction-core/) package...
77+
78+
We welcome pull requests to the latest development version branch.
7079

71-
---
7280
##Reaction Team
7381
Reaction is a project of [Ongo Works](http://ongoworks.com). We also have some light reading on our [blog](http://thoughts.reactioncommerce.com/), for those curious about who we are.

client/templates/layout.coffee

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
###
2+
# This is an example of a customized template.
3+
# This layout replaces the "coreLayout" template defined in the reactioncommerce:core package.
4+
# https://github.com/reactioncommerce/reaction-core/blob/master/client/templates/layout/layout.html
5+
###
6+
Template.layout.replaces "coreLayout"

client/templates/layout.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<div class="reaction-dashboard-drawer">{{> yield region="dashboard"}}</div>
55
<main role="main" id="main">
66
<div class="container-fluid">
7+
<span id="layout-alerts">{{>bootstrapAlerts}}</span>
78
{{> yield}}
89
</div>
910
</main>

0 commit comments

Comments
 (0)