Permalink
Browse files

Merge branch 'unstable'

  • Loading branch information...
2 parents 72ced31 + 9ac33ae commit 802ff672a7fb81f09c706ef160e6743a17ab959c @boutell boutell committed Sep 3, 2016
Showing 1,232 changed files with 97,751 additions and 79,111 deletions.
View
@@ -1,6 +1,21 @@
+test/public/modules/*
+test/public/css/master-*
npm-debug.log
*.DS_Store
+*.npmignore
node_modules
-# We do not commit CSS, only LESS
-public/css/*.css
-test/public
+test/node_modules
+
+# We do not commit CSS, only LESS, with the exception of a few vendor CSS files we don't have LESS for
+*/public/css/*.css
+lib/modules/*/public/css/*.css
+lib/modules/apostrophe-assets/public/css/vendor/cropper.css
+lib/modules/apostrophe-assets/public/css/vendor/pikaday.css
+lib/modules/apostrophe-ui/public/css/vendor/font-awesome/font-awesome.css
+
+# Dont commit test generated css
+test/public/css/*.css
+test/public/css/master-*.less
+
+# Dont commit test uploads
+test/public/uploads
View
@@ -1,7 +0,0 @@
-npm-debug.log
-*.DS_Store
-node_modules
-# We do not commit CSS, only LESS
-public/css/*.css
-# For now
-docs
View
@@ -1,10 +1,24 @@
language: node_js
node_js:
- - "0.11"
- "0.10"
-services: mongodb
+sudo: false
+services:
+ - docker
+ - mongodb
+
+# We need to download MongoDB 2.6.10
+env:
+ global:
+ - MONGODB_VERSION=2.6.10
+before_install:
+ - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-$MONGODB_VERSION.tgz
+ - tar xfz mongodb-linux-x86_64-$MONGODB_VERSION.tgz
+ - export PATH=`pwd`/mongodb-linux-x86_64-$MONGODB_VERSION/bin:$PATH
+ - mkdir -p data/db
+ - mongod --dbpath=data/db > /dev/null 2>&1 &
+ - sleep 3
# whitelist
branches:
only:
- - unstable
+ - master
View
@@ -1,7 +0,0 @@
-Copyright (c) 2013 P'unk Avenue LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -1,4 +1,5 @@
-# Apostrophe
+[![Build Status](https://travis-ci.org/punkave/apostrophe.svg?branch=master)](https://travis-ci.org/punkave/apostrophe)
-Please see the [Apostrophe documentation](http://apostrophenow.org) for complete information about building sites with Apostrophe.
+# Apostrophe
+Apostrophe is a CMS framework for nodejs that supports in-context editing, schema-driven content types, flexible widgets and a great deal more. This module contains everything necessary to build a website with Apostrophe. Please see the [Apostrophe documentation](http://apostrophenow.org) for complete information about building sites with Apostrophe.
View
@@ -0,0 +1,47 @@
+module.exports = {
+ modules: {
+ 'apostrophe-utils': {},
+ 'apostrophe-tasks': {},
+ 'apostrophe-launder': {},
+ 'apostrophe-i18n': {},
+ 'apostrophe-db': {},
+ 'apostrophe-caches': {},
+ 'apostrophe-migrations': {},
+ 'apostrophe-express': {},
+ 'apostrophe-push': {},
+ 'apostrophe-urls': {},
+ 'apostrophe-templates': {},
+ 'apostrophe-permissions': {},
+ 'apostrophe-assets': {},
+ 'apostrophe-admin-bar': {},
+ 'apostrophe-login': {},
+ 'apostrophe-browser-utils': {},
+ 'apostrophe-ui': {},
+ 'apostrophe-schemas': {},
+ 'apostrophe-docs': {},
+ 'apostrophe-versions': {},
+ 'apostrophe-tags': {},
+ 'apostrophe-modal': {},
+ 'apostrophe-attachments': {},
+ 'apostrophe-oembed': {},
+ 'apostrophe-pager': {},
+ // global comes first so it can register a doc type manager and clean things up before
+ // pages claims any orphan page types
+ 'apostrophe-global': {},
+ 'apostrophe-pages': {},
+ 'apostrophe-search': {},
+ 'apostrophe-any-page-manager': {},
+ 'apostrophe-areas': {},
+ 'apostrophe-rich-text-widgets': {},
+ 'apostrophe-html-widgets': {},
+ 'apostrophe-video-fields': {},
+ 'apostrophe-video-widgets': {},
+ 'apostrophe-groups': {},
+ 'apostrophe-users': {},
+ 'apostrophe-images': {},
+ 'apostrophe-images-widgets': {},
+ 'apostrophe-files': {},
+ 'apostrophe-files-widgets': {},
+ 'apostrophe-service-bridge': {}
+ }
+};
Oops, something went wrong.

0 comments on commit 802ff67

Please sign in to comment.