Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
language: python
cache: pip
cache:
- pip
- npm
python:
- '2.7'
env:
- TRAVIS_NODE_VERSION="4"
install:
- pip install -r requirements.txt
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
- npm install -g protractor
before_script:
- sh init.sh
- webdriver-manager update
- 'export CHROME_BIN=chromium-browser'
- 'export DISPLAY=:99.0'
- sh -e /etc/init.d/xvfb start
- sleep 3
script:
- pep8 --exclude=*/migrations/,A2A .
- python manage.py test
- python functional_test.py
deploy:
provider: heroku
api_key:
Expand Down
12 changes: 11 additions & 1 deletion A2A/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@

ALLOWED_HOSTS = []

SETTINGS_LOCAL_FILE = '/'.join([os.path.dirname(os.path.abspath(__file__)), 'settings_local.py'])
SETTINGS_LOCAL = {}
try:
execfile(SETTINGS_LOCAL_FILE, {}, SETTINGS_LOCAL)
except IOError as e:
pass


# Application definition

Expand Down Expand Up @@ -100,10 +107,13 @@
DEFAULT_FILE_STORAGE = 'storages.backends.dropbox.DropBoxStorage'
DROPBOX_OAUTH2_TOKEN = os.environ.get('DROPBOX')
else:
name = 'db.sqlite3'
if (os.environ.get('TRAVIS_TEST_ENV')):
name = 'dbtest.sqlite3'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
'NAME': os.path.join(BASE_DIR, name),
}
}

Expand Down
2 changes: 2 additions & 0 deletions A2A/settings_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import os
os.environ['TRAVIS_TEST_ENV'] = '1'
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ Rules
Python code follows PEP8
HTML and CSS code use 2 spcaes instead of 1 tab

Running test
----------------
python manage.py test (for backend)
python functional_test.py (for frontend, need to install protractor)

Team members
----------------
* Le Hong Quang
Expand Down
2 changes: 1 addition & 1 deletion client/javascripts/main/controllers/main.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function redirect() {
if (Authentication.isAuthenticated()) {
event.preventDefault();
//event.preventDefault();
window.location = '/newsfeed';
} else {
$state.go('home.login');
Expand Down
32 changes: 32 additions & 0 deletions client/static/bower_components/angular-bootstrap/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"author": {
"name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
},
"name": "angular-bootstrap",
"keywords": [
"angular",
"angular-ui",
"bootstrap"
],
"license": "MIT",
"ignore": [],
"description": "Native AngularJS (Angular) directives for Bootstrap.",
"version": "1.3.3",
"main": [
"./ui-bootstrap-tpls.js"
],
"dependencies": {
"angular": ">=1.4.0"
},
"homepage": "https://github.com/angular-ui/bootstrap-bower",
"_release": "1.3.3",
"_resolution": {
"type": "version",
"tag": "1.3.3",
"commit": "d45246707f5bf9533e3824861a29abd36757db45"
},
"_source": "https://github.com/angular-ui/bootstrap-bower.git",
"_target": "^1.3.3",
"_originalSource": "angular-bootstrap",
"_direct": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bower.json
120 changes: 120 additions & 0 deletions client/static/bower_components/angular-bootstrap/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
### UI Bootstrap - [AngularJS](http://angularjs.org/) directives specific to [Bootstrap](http://getbootstrap.com)

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/bootstrap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://secure.travis-ci.org/angular-ui/bootstrap.svg)](http://travis-ci.org/angular-ui/bootstrap)
[![devDependency Status](https://david-dm.org/angular-ui/bootstrap/dev-status.svg?branch=master)](https://david-dm.org/angular-ui/bootstrap#info=devDependencies)

### Quick links
- [Demo](#demo)
- [Installation](#installation)
- [NPM](#install-with-npm)
- [Bower](#install-with-bower)
- [NuGet](#install-with-nuget)
- [Custom](#custom-build)
- [Manual](#manual-download)
- [Support](#support)
- [FAQ](#faq)
- [Supported browsers](#supported-browsers)
- [Need help?](#need-help)
- [Found a bug?](#found-a-bug)
- [Contributing to the project](#contributing-to-the-project)
- [Development, meeting minutes, roadmap and more.](#development-meeting-minutes-roadmap-and-more)


# Demo

Do you want to see directives in action? Visit http://angular-ui.github.io/bootstrap/!

# Installation

Installation is easy as UI Bootstrap has minimal dependencies - only the AngularJS and Twitter Bootstrap's CSS are required.
Note: Since version 0.13.0, UI Bootstrap depends on [ngAnimate](https://docs.angularjs.org/api/ngAnimate) for transitions and animations, such as the accordion, carousel, etc. Include `ngAnimate` in the module dependencies for your app in order to enable animation.

#### Install with NPM

```sh
$ npm install angular-ui-bootstrap
```

This will install AngularJS and Bootstrap NPM packages.

#### Install with Bower
```sh
$ bower install angular-bootstrap
```

Note: do not install 'angular-ui-bootstrap'. A separate repository - [bootstrap-bower](https://github.com/angular-ui/bootstrap-bower) - hosts the compiled javascript file and bower.json.

#### Install with NuGet
To install AngularJS UI Bootstrap, run the following command in the Package Manager Console

```sh
PM> Install-Package Angular.UI.Bootstrap
```

#### Custom build

Head over to http://angular-ui.github.io/bootstrap/ and hit the *Custom build* button to create your own custom UI Bootstrap build, just the way you like it.

#### Manual download

After downloading dependencies (or better yet, referencing them from your favorite CDN) you need to download build version of this project. All the files and their purposes are described here:
https://github.com/angular-ui/bootstrap/tree/gh-pages#build-files
Don't worry, if you are not sure which file to take, opt for `ui-bootstrap-tpls-[version].min.js`.

### Adding dependency to your project

When you are done downloading all the dependencies and project files the only remaining part is to add dependencies on the `ui.bootstrap` AngularJS module:

```js
angular.module('myModule', ['ui.bootstrap']);
```

If you're a Browserify or Webpack user, you can do:

```js
var uibs = require('angular-ui-bootstrap');

angular.module('myModule', [uibs]);
```

# Support

## FAQ

https://github.com/angular-ui/bootstrap/wiki/FAQ

## Supported browsers

Directives from this repository are automatically tested with the following browsers:
* Chrome (stable and canary channel)
* Firefox
* IE 9 and 10
* Opera
* Safari

Modern mobile browsers should work without problems.


## Need help?
Need help using UI Bootstrap?

* Live help in the IRC (`#angularjs` channel at the `freenode` network). Use this [webchat](https://webchat.freenode.net/) or your own IRC client.
* Ask a question in [StackOverflow](http://stackoverflow.com/) under the [angular-ui-bootstrap](http://stackoverflow.com/questions/tagged/angular-ui-bootstrap) tag.

**Please do not create new issues in this repository to ask questions about using UI Bootstrap**

## Found a bug?
Please take a look at [CONTRIBUTING.md](CONTRIBUTING.md#you-think-youve-found-a-bug) and submit your issue [here](https://github.com/angular-ui/bootstrap/issues/new).


----


# Contributing to the project

We are always looking for the quality contributions! Please check the [CONTRIBUTING.md](CONTRIBUTING.md) for the contribution guidelines.

# Development, meeting minutes, roadmap and more.

Head over to the [Wiki](https://github.com/angular-ui/bootstrap/wiki) for notes on development for UI Bootstrap, meeting minutes from the UI Bootstrap team, roadmap plans, project philosophy and more.
19 changes: 19 additions & 0 deletions client/static/bower_components/angular-bootstrap/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"author": {
"name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
},
"name": "angular-bootstrap",
"keywords": [
"angular",
"angular-ui",
"bootstrap"
],
"license": "MIT",
"ignore": [],
"description": "Native AngularJS (Angular) directives for Bootstrap.",
"version": "1.3.3",
"main": ["./ui-bootstrap-tpls.js"],
"dependencies": {
"angular": ">=1.4.0"
}
}
2 changes: 2 additions & 0 deletions client/static/bower_components/angular-bootstrap/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require('./ui-bootstrap-tpls');
module.exports = 'ui.bootstrap';
23 changes: 23 additions & 0 deletions client/static/bower_components/angular-bootstrap/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "angular-ui-bootstrap",
"version": "1.3.3",
"description": "Bootstrap widgets for Angular",
"main": "index.js",
"homepage": "http://angular-ui.github.io/bootstrap/",
"repository": {
"type": "git",
"url": "https://github.com/angular-ui/bootstrap.git"
},
"keywords": [
"angular",
"bootstrap",
"angular-ui",
"components",
"client-side"
],
"author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
"peerDependencies": {
"angular": ">= 1.4.0-beta.0 || >= 1.5.0-beta.0"
},
"license": "MIT"
}
Loading