ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 17:45:10 +01:00
Code Issues Releases Wiki Activity
1,919 Commits 115 Branches 0 Tags 13 MiB
b4ddec3427
Commit Graph

368 Commits

Author SHA1 Message Date
vrde
d4bb23467e Fix link to terms 2015-07-15 16:57:41 +02:00
Tim Daubenschütz
1509c520a4 finalizing loan form 2015-07-15 14:48:51 +02:00
Tim Daubenschütz
81aeb478b7 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 14:06:03 +02:00
Tim Daubenschütz
795a268184 loan form styling and loan contract store 2015-07-15 14:03:23 +02:00
diminator
d03f98af76 loan url 2015-07-15 14:02:33 +02:00
Tim Daubenschütz
e3e8f088c7 add licences for cc 2015-07-15 11:28:53 +02:00
diminator
d97b219c2d licenses 2015-07-15 01:35:12 +02:00
Tim Daubenschütz
0351b6fce4 remove id from submission 2015-07-15 00:59:22 +02:00
Tim Daubenschütz
ebfd4339ab change prize submission to new backend route 2015-07-15 00:57:31 +02:00
Tim Daubenschütz
07f4cdd2e1 advance prize submission form 2015-07-15 00:52:16 +02:00
Tim Daubenschütz
0b9383576c Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 00:41:04 +02:00
Tim Daubenschütz
5e90f3cac7 remove buggy close button 2015-07-15 00:40:51 +02:00
vrde
45a49cafe9 Fix bug with getLangText 2015-07-15 00:37:45 +02:00
Tim Daubenschütz
56389a542e override api_urls and fix wording 2015-07-15 00:14:17 +02:00
Tim Daubenschütz
188f8ebf9c Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 23:54:00 +02:00
Tim Daubenschütz
07dce25fe7 add functionality for submit to prize button and fix delete button 2015-07-14 23:53:49 +02:00
vrde
d093fe013c Add awful hack to handle redirect on login and collection pages 2015-07-14 23:11:23 +02:00
Tim Daubenschütz
f8b87a8849 finish register artwork for prize 2015-07-14 20:35:16 +02:00
Tim Daubenschütz
18898b6f8a start working on register piece for price - WIP 2015-07-14 20:07:55 +02:00
Tim Daubenschütz
aa5934cd25 made inputcheckbox component generic 2015-07-14 19:53:49 +02:00
diminator
982b701a5c Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-14 17:45:39 +02:00
diminator
9fa9db8352 consign/unconsign 2015-07-14 17:42:15 +02:00
Tim Daubenschütz
5a0663ea14 unshare and delete functionality + store updates for all views 2015-07-14 16:29:01 +02:00
Tim Daubenschütz
adf4630efd Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_table/table_item_acl_filtered.js
 2015-07-14 14:46:30 +02:00
diminator
f6be4a2922 consign WIP 2015-07-14 14:16:51 +02:00
Tim Daubenschütz
373aa89041 fix bulk action refresh bug and add better feedback for edition creation 2015-07-14 13:58:33 +02:00
diminator
7a699d7cb8 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 2015-07-14 11:42:32 +02:00
diminator
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +02:00
Tim Daubenschütz
6bf28dbfa4 fix specify editions in register piece 2015-07-14 10:17:12 +02:00
diminator
3cc95cf7d5 acl WIP 2015-07-14 00:56:23 +02:00
diminator
1b3f614c80 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 2015-07-13 23:59:07 +02:00
diminator
9a7bf46675 acl WIP 2015-07-13 23:57:16 +02:00
diminator
a985fb855e acl WIP 2015-07-13 23:56:55 +02:00
vrde
19f82b2bbd work on register piece for for prize 2015-07-13 22:58:53 +02:00
Tim Daubenschütz
60600a72d4 refactor bulk acls for backend adjustment 2015-07-13 21:19:45 +02:00
vrde
7aea6669c9 Refactor login and signup 2015-07-13 20:47:43 +02:00
vrde
3f0cdbad06 Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 20:02:42 +02:00
vrde
4af174dffb Work on signup/login 2015-07-13 19:53:16 +02:00
Tim Daubenschütz
6e1cf55841 Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_create_editions.js
 2015-07-13 18:54:06 +02:00
Tim Daubenschütz
463f205a6e finalized: separation of edition creation and edition form 2015-07-13 18:52:55 +02:00
diminator
1f73811950 register form separate 
spinner => spans
 2015-07-13 18:13:47 +02:00
Tim Daubenschütz
85ba816a53 separate polling-success functionality 2015-07-13 18:13:16 +02:00
Tim Daubenschütz
e71c2f9fe0 separate create edition form logic 2015-07-13 17:09:44 +02:00
vrde
232a4ede92 Add form_login 2015-07-13 16:59:12 +02:00
vrde
db1c6a530a Refactor login/signup containers 2015-07-13 16:57:25 +02:00
diminator
a07bc9e0e2 piece + share 
acl first cut
 2015-07-13 14:10:46 +02:00
diminator
88ff4b55d6 acl buttons and share forms for pieces/editions 2015-07-10 20:00:35 +02:00
diminator
62289be5ce polling for editions 2015-07-10 18:51:35 +02:00
diminator
e282da8474 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 17:52:39 +02:00
Tim Daubenschütz
e55bc239b4 refactor signup form 2015-07-10 16:04:57 +02:00
Tim Daubenschütz
b364414e16 input checkbox functionality 2015-07-10 15:56:54 +02:00
diminator
8679a2446d Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 14:49:19 +02:00
Tim Daubenschütz
62ae8fd08b fix warnings 2015-07-10 14:15:22 +02:00
Tim Daubenschütz
1df068d75f add edition creation functionality 2015-07-10 13:54:25 +02:00
diminator
6a84e9d36e whitelabel logo + sluice 2015-07-10 11:59:03 +02:00
diminator
22b201f388 register piece returns to piece detail 2015-07-10 10:30:17 +02:00
diminator
bf0a36f2a3 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:59:16 +01:00
diminator
fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:54:11 +01:00
diminator
9fd4c1a6fd otherdata and extradata on a piece level and templated in frontend 2015-07-09 13:37:33 +01:00
Tim Daubenschütz
773cab6505 remove piece list edition table toggle and put it inside of accordion list item 2015-07-09 14:04:48 +02:00
Tim Daubenschütz
d514a553f2 reformat intendation for login modal handler 2015-07-09 12:06:09 +02:00
Tim Daubenschütz
35a287b8a1 made edition registration optional 2015-07-09 11:56:54 +02:00
Tim Daubenschütz
c945fc315b various visual changes 2015-07-08 14:37:20 +02:00
Sylvain Bellemare
f066008ce9 translated english text to french 2015-07-08 09:57:50 +02:00
Tim Daubenschütz
22629ac09d adjust register piece form 2015-07-07 18:07:12 +02:00
diminator
9d30b9e3b2 embed 2015-07-03 12:35:45 +02:00
Sylvain Bellemare
3eedda7724 [WIP] adding localisation support for French 2015-07-02 19:13:40 +02:00
diminator
18f3b51153 fineuploader session with cors 2015-07-02 11:54:33 +02:00
diminator
4ca2144c0c request actions in frontend 2015-07-01 19:05:47 +02:00
diminator
8fc400bb01 licenses in registration 2015-06-30 10:42:58 +02:00
Tim Daubenschütz
bf2a766e84 implement submission for autofill firefox and chrome 2015-06-24 15:52:43 +02:00
ddejongh
208e580985 share + email combined 2015-06-23 17:01:15 +02:00
ddejongh
41d70a9a15 Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar 
Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss
 2015-06-23 16:07:17 +02:00
ddejongh
95f6c08706 localization 2015-06-23 16:02:48 +02:00
ddejongh
89884ced1f edition detail updated with forms 2015-06-22 23:32:41 +02:00
ddejongh
02f8193743 style tweaks 2015-06-22 18:02:04 +02:00
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