1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-29 00:58:03 +02:00
Commit Graph

442 Commits

Author SHA1 Message Date
ddejongh
9e1a76a08e api settings complete 2015-06-22 17:33:25 +02:00
ddejongh
f836d4c2d4 register first cut 2015-06-22 10:50:22 +02:00
ddejongh
23190f6c48 signup/login 2015-06-20 16:43:18 +02:00
ddejongh
c2d8b78136 settings 2015-06-18 19:03:03 +02:00
ddejongh
fabff2922c account settings 2015-06-17 17:48:23 +02:00
ddejongh
ff12048c10 edition note 2015-06-16 16:38:22 +02:00
ddejongh
9cf060fdc4 csrf subdomain 2015-06-16 14:49:00 +02:00
ddejongh
1ecd579718 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not
Conflicts:
	js/utils/requests.js
2015-06-16 14:06:35 +02:00
ddejongh
8d73e4a77b edit acl
editionnote
2015-06-16 14:01:53 +02:00
vrde
03f09b8c83 Rename fetch to requests to avoid name clashing 2015-06-16 13:48:48 +02:00
vrde
a247e111c0 Merge branch 'AD-421-add-signup-functionality'
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
2015-06-16 10:58:41 +02:00
Tim Daubenschütz
1c8ac24127 replace amazon links 2015-06-16 09:59:09 +02:00
ddejongh
cf3b7f234d password reset ok 2015-06-15 16:56:17 +02:00
ddejongh
56d32efcc0 password reset
modal switch problems
2015-06-15 15:28:53 +02:00
Tim Daubenschütz
6e7037e5f2 Finish implementing refactor for open and close for edition lists 2015-06-15 09:29:34 +02:00
ddejongh
0f1108b14e form password + signup 2015-06-11 17:22:11 +02:00
ddejongh
4f5e7a0821 login form 2015-06-11 15:35:18 +02:00
ddejongh
bf0a2aeefb consign unconsign requests
async emails
2015-06-11 15:03:55 +02:00
ddejongh
af71196dfd delete function for multi editions 2015-06-10 15:49:46 +02:00
ddejongh
9241d3e38f further details functional / unstyled 2015-06-09 17:24:06 +02:00
ddejongh
509aa111ab Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
2015-06-09 16:10:38 +02:00
ddejongh
30ee436f4c Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
2015-06-09 16:09:59 +02:00
ddejongh
6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00
Tim Daubenschütz
76a41a23b9 add details to piece detail page 2015-06-05 14:22:02 +02:00
Tim Daubenschütz
a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +02:00
Tim Daubenschütz
f987bce7cc add es6lint to build process and fix most (not really) errors and warnings 2015-06-05 11:06:36 +02:00
ddejongh
6078410240 refactored buttons 2015-06-03 10:27:11 +02:00
ddejongh
a51c27fb9f loan form styled,
overlay styled
2015-06-02 18:43:37 +02:00
Tim Daubenschütz
95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
ddejongh
d157719043 multiloan 2015-06-02 15:38:47 +02:00
ddejongh
74faa286f1 loan/share forms multiedition 2015-06-02 14:00:05 +02:00
ddejongh
dc3d024f8d bulk transfer part 1 2015-06-02 11:38:18 +02:00
vrde
165d2e9b1d Fix datetime selector 2015-06-01 14:49:13 +02:00
vrde
f50d28be98 Refactor fetch, WIP 2015-06-01 14:22:04 +02:00
ddejongh
f9a3be61d2 loan date 2015-06-01 14:16:06 +02:00
ddejongh
d90a4f97db loan 2015-06-01 13:02:53 +02:00
ddejongh
2c7535a73a unconsign 2015-05-29 16:53:30 +02:00
ddejongh
c6e97d916d Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi
Conflicts:
	piece/models.py
	web/urls/frontend.py
2015-05-29 15:27:40 +02:00
ddejongh
961b8ee58d errors for non-fields, 500
removed retry
consign_form
2015-05-29 15:16:42 +02:00
ddejongh
7a18c150c7 merged all branches
fixed clear errors
2015-05-29 10:58:07 +02:00
ddejongh
c3ea9aecbe form framework
- inputtext, area, btn
 - alertmixin
 - formmixin
 - 500
 - transfer/share
2015-05-29 01:54:56 +02:00
ddejongh
0a4dae850b solved error + reusability refactor 2015-05-28 18:18:13 +02:00