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,180 Commits 115 Branches 0 Tags 13 MiB
66cd4a1d7b
Commit Graph

1180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6c85d43cfc Rebuild 2015-07-14 23:53:42 +02:00
vrde
5e0473c8fd Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' 2015-07-14 23:42:23 +02:00
vrde
d093fe013c Add awful hack to handle redirect on login and collection pages 2015-07-14 23:11:23 +02:00
diminator
73d3055329 Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from- 2015-07-14 22:53:12 +02:00
vrde
aec1ff2173 Fix acl proxy 2015-07-14 22:50:48 +02:00
vrde
63c78d09d9 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 22:43:03 +02:00
vrde
6405d08673 Merge branch 'AD-499-custom-api-url-mapping' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 22:42:10 +02:00
Tim Daubenschütz
8f386dc0cf adjust acl proxy 2015-07-14 22:34:34 +02:00
Tim Daubenschütz
d183b9ba1c include intercom 2015-07-14 21:47:14 +02:00
diminator
a9ac7b5a57 removed promocode 
prize/<id>/users/ POST, LIST
prize/<id>/users/login
 2015-07-14 21:20:34 +02:00
Tim Daubenschütz
5ae80efaa7 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 21:18:32 +02:00
Tim Daubenschütz
483e24b234 add missing language strings 2015-07-14 21:18:05 +02:00
vrde
62b0981cd7 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 21:15:54 +02:00
vrde
c5fd8aa28f Add custom url mapping 2015-07-14 21:15:10 +02:00
Tim Daubenschütz
d2b2bdf7d5 add custom submit button to piece list 2015-07-14 21:13:15 +02:00
Tim Daubenschütz
b52d000ac7 made add work conditional 2015-07-14 21:06:11 +02:00
Tim Daubenschütz
f8b87a8849 finish register artwork for prize 2015-07-14 20:35:16 +02:00
Tim Daubenschütz
6a04a1a053 fix fineuploader issue after unmounting react-s3-fineuploader 2015-07-14 20:10:41 +02:00
Tim Daubenschütz
18898b6f8a start working on register piece for price - WIP 2015-07-14 20:07:55 +02:00
vrde
5ced62c496 Cleanup constants 2015-07-14 20:06:13 +02:00
Tim Daubenschütz
aa5934cd25 made inputcheckbox component generic 2015-07-14 19:53:49 +02:00
Tim Daubenschütz
49b530870d fix overflow issue 2015-07-14 19:03:10 +02:00
Tim Daubenschütz
190a65b981 restyle powered by 2015-07-14 19:01:14 +02:00
Tim Daubenschütz
e833dbf61a Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 18:56:00 +02:00
Tim Daubenschütz
97f8d416af styling again 2015-07-14 18:55:34 +02:00
vrde
dffcbc1191 Restore toolbar 2015-07-14 18:54:47 +02:00
Tim Daubenschütz
e49b920318 more styling on the landing page 2015-07-14 18:34:46 +02:00
vrde
ce46f7c886 Fix bug in whitelabel landing page 2015-07-14 18:00:34 +02:00
diminator
27f04f59a3 Merged in AD-419-decouple-piece-registration-from- (pull request #9) 
Ad 419 decouple piece registration from
 2015-07-14 17:51:46 +02:00
diminator
a86ea00c7e Merged in AD-419-decouple-piece-registration-from- (pull request #8) 
Ad 419 decouple piece registration from
 2015-07-14 17:50:35 +02:00
diminator
4dfff8d6a5 Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from- 2015-07-14 17:50:01 +02:00
diminator
89a83961d9 span -> diff 2015-07-14 17:49:31 +02:00
diminator
890a312eff merge 2015-07-14 17:46:19 +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
ff64734545 styling 2015-07-14 17:41:57 +02:00
Tim Daubenschütz
5ef63fbba3 use local whitelabel constants for route switching 2015-07-14 17:12:32 +02:00
Tim Daubenschütz
8d15238818 add subdomain settings to constants 2015-07-14 16:53:27 +02:00
Tim Daubenschütz
26f35d7628 Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 16:48:50 +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
Tim Daubenschütz
cc89475d0c add routine to refresh specific edition list 2015-07-14 14:45:33 +02:00
vrde
b64fbe3871 Rebuild 2015-07-14 14:36:52 +02:00
diminator
00d6ca9536 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from- 2015-07-14 14:17:24 +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
Tim Daubenschütz
e13649383a add filter function for acl actions 2015-07-14 13:34:32 +02:00
vrde
695a195e55 Replace history for slider 2015-07-14 12:32:18 +02:00