Merge lp:~james-jamesan/tagin/devel into lp:~jorge-silva/tagin/pylons-test
Proposed by
Jorge Silva
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~james-jamesan/tagin/devel |
| Merge into: | lp:~jorge-silva/tagin/pylons-test |
| To merge this branch: | bzr merge lp:~james-jamesan/tagin/devel |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jorge Silva | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Implements basic fingerprint submission on proposed REST architecture
To post a comment you must log in.
Unmerged revisions
- 23. By James
-
Added Firefox extension
- 22. By James
-
Fixed minor stylistic and formmatting inconsistencies
- 21. By James
-
Added support for simple Firefox extension to insert WAP fingerprint into tag creation form
- 20. By James
-
Enabled MAC address model and fixed Fingerprint/Mac relationship; implemented fingerprint RESTful controller; added a reset controller to clear and input test data; added beginnings of JS to retrieve wireless fingerprint
- 19. By James
-
Upgrade project to Pylons 1.0; changed templates to use webhelpers to create forms
- 18. By James
-
Fixed schema mapping bug; enabled all DB tables; added 3 initial tags
- 17. By watcher <watcher@james>
-
Disabled all tables except tags; migrated DB to PostgreSQL; implemented RESTful tag controller
- 16. By watcher <watcher@james>
-
Minor typo fix
When trying to merge, bazaar throws:
bzr: ERROR: Not a branch: "bzr+ssh:
tagin/devel has been renamed to pylons-test, so maybe there is a configuration error in your branch? Odd that Launchpad is picking it up properly... maybe there is also a versioning issue since it has been so long since we last worked on this.
Let me know if you can figure it out!