Skip to content
This repository has been archived by the owner on Jun 1, 2022. It is now read-only.

Commit

Permalink
Merge pull request #261 from editorsnotes/api-everything
Browse files Browse the repository at this point in the history
Use API for all data except auth; get rid of HTML interface (except auth)
  • Loading branch information
ptgolden committed Jul 28, 2015
2 parents 3ad57a5 + a2a95e3 commit e37756a
Show file tree
Hide file tree
Showing 419 changed files with 3,106 additions and 82,819 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ build/*
lib/*
local
local/*
man/*
include/*
share/*
src/*
Expand Down
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
install:
- "CFLAGS=\"-O0\" && pip install -r requirements.txt"
- "pip install -q fabric==1.5.1"
- "npm install"

before_script:
- fab make_settings
Expand All @@ -18,8 +17,7 @@ before_script:
- "sed -i -e \"s|# STORAGE_PATH: ''|STORAGE_PATH: '$TRAVIS_BUILD_DIR/editorsnotes/static'|\" editorsnotes/settings_local.py"
- mkdir -p $TRAVIS_BUILD_DIR/editorsnotes/static
- python manage.py collectstatic --noinput -v0
- python manage.py compile_browserify
- psql -c "CREATE DATABASE testdb;" -U postgres

script:
- python manage.py test main api
- python manage.py test
2 changes: 1 addition & 1 deletion editorsnotes/admin/forms/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
BaseModelFormSet, ModelForm, modelformset_factory, ValidationError)

from editorsnotes.main.management import get_all_project_permissions
from editorsnotes.main.models import (
from editorsnotes.auth.models import (
User, Project, ProjectInvitation, ProjectRole)

class ProjectRoleField(forms.ModelChoiceField):
Expand Down
207 changes: 0 additions & 207 deletions editorsnotes/admin/static/function/admin-bootstrap-base.js

This file was deleted.

Loading

0 comments on commit e37756a

Please sign in to comment.