ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-25 18:56:28 +02:00
Code Issues Releases Wiki Activity
2,566 Commits 115 Branches 0 Tags 13 MiB
abebbe2e51
Commit Graph

131 Commits

Author SHA1 Message Date
Tim Daubenschütz
a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-15 10:06:39 +02:00
Cevo
2d87533009 prop types added 2015-10-14 11:41:16 +02:00
Cevo
b4b05b3161 information added to forms and delete form title changed, acl information component created, information text is added to the constants 2015-10-13 18:33:08 +02:00
diminator
790bf595d9 glyphs, spinner, piece list/edition table 2015-10-09 16:21:26 +02:00
Cevo
b8f7527a0b console.logs removed 2015-10-09 14:32:45 +02:00
Cevo
03680bd830 information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them) 2015-10-09 14:19:43 +02:00
Cevo
f2d02179a1 pullrequest changes 2015-10-08 13:19:59 +02:00
Cevo
924b462cc1 sharare button moved to the right 2015-10-08 10:14:06 +02:00
Cevo
bb3670ef4d padding and border added 2015-10-07 13:52:30 +02:00
Cevo
70eedbabaf line spacing in info text edited 2015-10-06 10:20:57 +02:00
Tim Daubenschütz
f9393c5bb3 Remove all unneccessary react-router imports 2015-10-01 14:36:56 +02:00
Cevo
7b9424ca68 merging from master and resolving the conflicts in main.scss, master overrides 2015-09-29 11:59:18 +02:00
Tim Daubenschütz
df338ac746 Fix alignment for AclInformationButton 2015-09-29 10:31:13 +02:00
Cevo
661cb44b94 reached the spec with dirty tricks 2015-09-28 22:09:25 +02:00
Cevo
48f43ac01c the real dropdown version second iteration 2015-09-25 14:36:27 +02:00
Cevo
4ae73871d3 initial push for version controlling, will be edited 2015-09-24 16:06:53 +02:00
diminator
d6bd4b4ac1 bug fix acl button 
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
 2015-09-16 14:07:13 +02:00
vrde
2f5c70eceb Remove unused ButtonSubmitOrClose and styles 2015-09-02 17:36:01 +02:00
diminator
79106dd106 loan request + answer complete 2015-08-27 11:38:21 +02:00
diminator
b2fed6426f loan request up till accept 2015-08-26 09:50:38 +02:00
Tim Daubenschütz
8ff2dea4df refactor: acl buttons message functionality 2015-08-10 15:57:20 +02:00
Tim Daubenschütz
3afb036f24 rename apiUrls to ApiUrls 2015-08-07 15:08:02 +02:00
Tim Daubenschütz
8f9c699b69 Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r 
Conflicts:
	js/components/ascribe_buttons/submit_to_prize_button.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
 2015-08-07 14:10:05 +02:00
Tim Daubenschütz
e227db1b3b fix create editions for filter widget 2015-08-06 13:43:53 +02:00
Tim Daubenschütz
ee97e600ef fix bug in piece list filter widget 2015-08-06 13:15:52 +02:00
Tim Daubenschütz
d66549478f WIP: Refactor delete editions form 2015-08-05 18:14:49 +02:00
Tim Daubenschütz
4c88f88d56 first cut porting and using new react-bootstrap version 2015-08-05 17:32:35 +02:00
Tim Daubenschütz
f3e378f221 update react-bootstrap first cut 2015-08-05 16:49:25 +02:00
diminator
792325f71d acl_create_editions 2015-08-05 16:02:48 +02:00
diminator
36356dd5c5 Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- 2015-08-05 14:52:18 +02:00
Tim Daubenschütz
fc0bccbff3 add filterBy to edition list action|store 2015-08-04 15:06:02 +02:00
diminator
5ce549e533 disable submit prize with ACL 2015-08-04 13:15:38 +02:00
Tim Daubenschütz
13e151e83b add logging and responsive user navigation 2015-07-16 19:12:18 +02:00
diminator
a0e6e0c5a4 Merge branch 'AD-419-decouple-piece-registration-from-' 2015-07-15 18:01:38 +02:00
diminator
58294687f9 fix acl and editions 2015-07-15 17:51:09 +02:00
Tim Daubenschütz
f3ea3460bb reload piece list after clicking on create editions 2015-07-15 17:22:28 +02:00
Tim Daubenschütz
1509c520a4 finalizing loan form 2015-07-15 14:48:51 +02:00
Tim Daubenschütz
795a268184 loan form styling and loan contract store 2015-07-15 14:03:23 +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
Tim Daubenschütz
8f386dc0cf adjust acl proxy 2015-07-14 22:34:34 +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
Tim Daubenschütz
cc89475d0c add routine to refresh specific edition list 2015-07-14 14:45:33 +02:00
diminator
f6be4a2922 consign WIP 2015-07-14 14:16:51 +02:00
diminator
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +02:00
diminator
3cc95cf7d5 acl WIP 2015-07-14 00:56:23 +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
Tim Daubenschütz
60600a72d4 refactor bulk acls for backend adjustment 2015-07-13 21:19:45 +02:00
diminator
fd2f99f1b0 acl indexof 2015-07-13 20:16:08 +02:00
Tim Daubenschütz
463f205a6e finalized: separation of edition creation and edition form 2015-07-13 18:52:55 +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
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
Tim Daubenschütz
6d72352580 some minor corrections 2015-07-08 10:15:58 +02:00
Sylvain Bellemare
f066008ce9 translated english text to french 2015-07-08 09:57:50 +02:00
diminator
f58a65eb0c s3 views dont accept anonymous 2015-07-01 11:43:33 +02:00
Tim Daubenschütz
d67bbe7770 made accordion table responsive 2015-07-01 10:53:40 +02:00
Tim Daubenschütz
26442c9230 add margins to button lists 2015-06-30 17:12:13 +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
ddejongh
3784d53609 code review 2015-06-16 10:02:55 +02:00
Tim Daubenschütz
1c8ac24127 replace amazon links 2015-06-16 09:59:09 +02:00
Tim Daubenschütz
e2997891df loading icon for piece list 2015-06-16 09:57:14 +02:00
ddejongh
cf3b7f234d password reset ok 2015-06-15 16:56:17 +02:00
Tim Daubenschütz
6e7037e5f2 Finish implementing refactor for open and close for edition lists 2015-06-15 09:29:34 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +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
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
6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00
Tim Daubenschütz
95f4efa92d merge conflict 2015-06-05 16:21:36 +02:00
Tim Daubenschütz
443829320f add personal note to piece detail page 2015-06-05 16:20:28 +02:00
Tim Daubenschütz
3a812e531d fix search bug 2015-06-05 15:17:35 +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
28a1c8f2d4 fix modal undefined bug 2015-06-03 11:49:39 +02:00
ddejongh
265a7573ce aclbuttonlist willmount 2015-06-03 10:43:59 +02:00
ddejongh
6078410240 refactored buttons 2015-06-03 10:27:11 +02:00