Tim Daubenschütz
|
3e22ad1d9d
|
Finalize layouting submission form
|
2015-11-09 10:35:23 +01:00 |
|
Tim Daubenschütz
|
9765ed040b
|
Add tertiary button style
|
2015-10-27 17:15:23 +01:00 |
|
Tim Daubenschütz
|
12c7fa7ba4
|
Change delete button back to old styling
|
2015-10-27 16:32:26 +01:00 |
|
Tim Daubenschütz
|
3bf70628c1
|
Finalizing behavior of AclInformation
|
2015-10-23 11:24:26 +02:00 |
|
Tim Daubenschütz
|
cd3c8b8f6e
|
Complete visual styling
|
2015-10-23 10:37:23 +02:00 |
|
Tim Daubenschütz
|
e8a9cd89a4
|
Add resizing functionality to AclButtonList and AclInformation
|
2015-10-23 09:29:17 +02:00 |
|
Tim Daubenschütz
|
d4de2434ee
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
js/components/ascribe_forms/form_share_email.js
js/components/ascribe_forms/form_transfer.js
js/utils/general_utils.js
sass/main.scss
|
2015-10-22 13:38:49 +02:00 |
|
Tim Daubenschütz
|
a9fa60eaf2
|
Fix buttons for cc
|
2015-10-21 14:52:25 +02:00 |
|
Tim Daubenschütz
|
8d0e9a42fc
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
package.json
|
2015-10-20 18:11:41 +02:00 |
|
Tim Daubenschütz
|
ddc2e7b919
|
Rename intersectAcls to intersectList and do some clean up
|
2015-10-20 18:10:48 +02:00 |
|
Tim Daubenschütz
|
8417c2781e
|
Making AclInformation more robust by adding checks for if the information to display is available
|
2015-10-20 18:00:59 +02:00 |
|
Tim Daubenschütz
|
beee069d3f
|
Minor layouting fixes
|
2015-10-20 15:51:22 +02:00 |
|
Tim Daubenschütz
|
22a95f07fd
|
Further cleanup
|
2015-10-20 15:10:18 +02:00 |
|
Tim Daubenschütz
|
f0d8e32ecf
|
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
|
2015-10-19 10:30:14 +02:00 |
|
Tim Daubenschütz
|
702f1d29f3
|
Styling
|
2015-10-15 11:41:46 +02:00 |
|
Tim Daubenschütz
|
d77bdb25a5
|
Cleanup code
|
2015-10-15 11:17:16 +02:00 |
|
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 |
|