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
diminator
c24021302f
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_hero.js
2015-10-14 17:25:53 +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
vrde
2967a29f2e
Set title to edition/piece containers
2015-10-13 17:52:45 +02:00
Tim Daubenschütz
8ac69bab5d
Change additional files label
2015-10-13 10:20:23 +02:00
diminator
8d970a65c4
spinners in forms
...
button wide
2015-10-12 17:55:02 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +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
087884ef3c
sharare button moved to the right
2015-10-08 10:14:50 +02:00
Cevo
924b462cc1
sharare button moved to the right
2015-10-08 10:14:06 +02:00
Tim Daubenschütz
28dfcfa75a
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
...
Conflicts:
js/components/ascribe_detail/edition.js
js/components/ascribe_forms/form_login.js
js/components/ascribe_forms/form_signup.js
2015-10-06 16:40:02 +02:00
Tim Daubenschütz
8ba6f11dfe
Fix AccordionListTable item links and missing location propagation
2015-10-01 14:54:56 +02:00
Tim Daubenschütz
83c652a4f0
Rename pieces routes back to collection
2015-10-01 14:30:11 +02:00
Tim Daubenschütz
829f2c592b
Switch all usages of Router.Navigation and Router.State
2015-10-01 11:16:38 +02:00
diminator
b233dbb937
PR fixes
2015-10-01 09:49:01 +02:00
Tim Daubenschütz
8cd4377a58
Change links in app to new react-router@1.0rc1 syntax
2015-09-30 18:30:50 +02:00
diminator
44cf707e34
refactoring out edition_actions
2015-09-30 12:12:14 +02:00
diminator
009d12ee53
Merge remote-tracking branch 'remotes/origin/AD-772-coa-doesnt-render' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:56 +02:00
diminator
b773ac829a
Merge remote-tracking branch 'remotes/origin/master' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:37 +02:00
diminator
55f5d959ff
PR fixes
2015-09-30 11:26:31 +02:00
Cevo
23f10d4d7f
qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh
2015-09-30 10:53:16 +02:00
diminator
4f6e39699f
PR getlangtext
2015-09-30 09:46:11 +02:00
diminator
ea4805caa0
create CoA when not found
2015-09-30 09:14:57 +02:00
diminator
cda81b6f5b
withdraw consign
...
and acl buttonlist in detail refactor
2015-09-29 18:09:34 +02:00
Tim Daubenschütz
e356570bc8
remove console log
2015-09-29 17:56:18 +02:00
diminator
f64fb73aa6
cc fixes in licenses, collection and details
2015-09-29 15:58:24 +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
diminator
9bb5a51fed
bug fix show public note for anonymous
2015-09-28 17:11:15 +02:00
Tim Daubenschütz
9045b9ec01
refresh piece list on every major acl action
2015-09-28 16:32:59 +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
Tim Daubenschütz
c00e003aeb
refactor input textarea to use disabled instead of editable
2015-09-21 12:05:42 +02:00
diminator
ff163df61e
PR update
2015-09-17 14:20:46 +02:00
diminator
63fffc2132
PR comments fix
2015-09-17 11:39:55 +02:00
Tim Daubenschütz
7c376b7229
PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants
2015-09-16 15:14:08 +02:00
Tim Daubenschütz
497a330e1a
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 13:56:31 +02:00
Cevo
6a57a69e29
main.scss edited
2015-09-15 13:53:09 +02:00
Tim Daubenschütz
73c2a7c544
rename fineuploader's submitKey method to submitFile
2015-09-14 14:46:03 +02:00
diminator
6013303bd6
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
2015-09-10 17:45:51 +02:00
Tim Daubenschütz
b5e5102ea4
replace in keyword with dot notation checking
2015-09-10 14:00:59 +02:00
Tim Daubenschütz
c3b71b5398
WIP: make fineuploader an input
2015-09-10 10:51:47 +02:00
diminator
73ee0753c1
refactored notifications per detail
2015-09-03 17:25:22 +02:00
diminator
9334251fd3
notifications on piece details (www, ikono, cyland) and edition details
2015-09-03 15:17:12 +02:00
diminator
edcd8e57a4
notification app
...
notification refactor in onion - split by piece/edition
2015-09-03 14:15:00 +02:00
Cevo
6555c02f23
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-02 14:03:02 +02:00
Cevo
aa3c188509
contract list add
2015-09-02 14:02:23 +02:00
diminator
92971a9f62
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
...
Conflicts:
sass/ascribe_accordion_list.scss
2015-09-02 10:50:33 +02:00
diminator
bfaf4886a4
notifications unoptimized
2015-09-01 14:45:14 +02:00
Tim Daubenschütz
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +02:00
Tim Daubenschütz
ddfc8b9621
minor fixes
2015-08-28 14:27:02 +02:00
Tim Daubenschütz
52ae348e57
dynamic acl for acl_submit
2015-08-28 14:07:29 +02:00
Tim Daubenschütz
e9d0311f58
custom ikonotv piece page
2015-08-28 12:33:00 +02:00
Tim Daubenschütz
2c26aab8cc
add exception for loaning a piece for ikonotv
2015-08-28 12:20:36 +02:00
diminator
bc28f3d8f5
loan request actions for multiple actions
2015-08-27 13:43:26 +02:00
diminator
c64aae332d
Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an
2015-08-26 16:54:41 +02:00
Tim Daubenschütz
6808c7c228
remove loan button from piece detail page
2015-08-26 16:44:24 +02:00
diminator
5fcee39ed3
shortlisting enabled up till loan request
2015-08-25 15:19:10 +02:00
diminator
411b7cb010
increase otherdata limit to 50MB
2015-08-24 12:11:07 +02:00
diminator
440dcd9785
Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page
2015-08-24 11:36:30 +02:00
Tim Daubenschütz
96fe1c69c6
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
2015-08-24 11:22:54 +02:00
Tim Daubenschütz
d05662b879
fix PR issues
2015-08-24 11:22:44 +02:00
diminator
0be6b7f118
bug fix loadPiece
2015-08-24 11:01:42 +02:00
diminator
3b27238adf
request form on piece level
...
bug fix cyland piece endpoint
bug fix otherDataUploader editable
2015-08-24 10:48:40 +02:00
diminator
7a09b863b5
switch between request action and acl buttons on piece detail page
2015-08-21 16:49:04 +02:00
diminator
8b6c5e6e0f
username boolean
2015-08-21 16:39:06 +02:00
diminator
33cd23d11e
getlangtext
2015-08-21 16:38:18 +02:00
diminator
ea9fb306c4
add request action loan to piece
2015-08-21 16:22:08 +02:00
diminator
edec430109
public and private note in edition and piece
...
connection in frontend
2015-08-21 15:04:38 +02:00
Tim Daubenschütz
116cb9c2fc
fix disappearing fineuploader in additional data
2015-08-21 14:07:10 +02:00
Tim Daubenschütz
09c0451c86
Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
...
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
2015-08-21 11:34:47 +02:00
Tim Daubenschütz
3b46dbb9f5
add upload busy function to fineuploader
2015-08-21 11:11:31 +02:00
Tim Daubenschütz
30d57a943f
fix lock form
2015-08-21 11:01:13 +02:00
diminator
5c6b753acb
piece loan history
2015-08-20 15:50:30 +02:00
diminator
ffdb4847db
piece bitcoin id
2015-08-20 14:01:02 +02:00
diminator
5b2ab6c1e2
bug fix acls
...
otherdata frontend
MIGRATE + loaddate whitelabel
2015-08-20 11:32:11 +02:00
Tim Daubenschütz
ad8be7e34a
separate pre-sending form submission functionality
2015-08-18 13:15:22 +02:00
diminator
fc82c866fb
cyland refactor
...
whitelabel + cyland app
2015-08-17 20:52:36 +02:00
diminator
12dde0458c
Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page
2015-08-17 09:56:55 +02:00
diminator
d24b325062
bug fix loadPiece
2015-08-13 14:16:44 +02:00
diminator
97c298e304
piece navigation prev next WIP
2015-08-12 16:47:16 +02:00
Tim Daubenschütz
d5dc164810
boilerplate for loan process
2015-08-12 13:34:41 +02:00
diminator
22727c2703
refactored piece container and detail
2015-08-11 17:12:12 +02:00
diminator
bdeef598eb
Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r'
...
Conflicts:
js/components/settings_container.js
2015-08-10 17:07:15 +02:00
Tim Daubenschütz
5be771f6ac
add inline property to form
2015-08-10 14:15:32 +02:00
Tim Daubenschütz
3afb036f24
rename apiUrls to ApiUrls
2015-08-07 15:08:02 +02:00
vrde
e9c776fec4
Add "s" to http lol
2015-08-07 14:23:59 +02:00
Tim Daubenschütz
192f776bd8
Filter open edition tables correctly
2015-08-07 13:05:50 +02:00
Tim Daubenschütz
17b991e06b
adjust store calls to fetch list to new interface
2015-08-04 11:48:12 +02:00
vrde
72821001b7
Merge branch 'AD-601-in-piece_detail-longer-titles-are'
...
Conflicts:
.gitignore
2015-08-03 13:44:53 +02:00
Tim Daubenschütz
52f10f178f
Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are
2015-07-30 11:49:48 +02:00
Tim Daubenschütz
79bef1e0a9
add ellipsis functionality to detail property
2015-07-30 11:48:47 +02:00
diminator
bab29d6ffa
Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do'
...
Conflicts:
js/components/ascribe_forms/form_loan.js
2015-07-29 15:55:16 +02:00
Tim Daubenschütz
9ebc489c78
refresh piece list correctly after piece with edition creation
2015-07-29 15:24:30 +02:00
diminator
deebacd063
Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22 )
...
Ad 601 in piece_detail longer titles are
2015-07-29 14:16:40 +02:00
Tim Daubenschütz
275f6c839e
minor fixes
2015-07-27 18:24:21 +02:00
Tim Daubenschütz
1a1ba8bbb1
add ellipsis again
2015-07-27 18:19:55 +02:00
Tim Daubenschütz
a05698efc1
fix app crashing bug when transferring an edition
2015-07-27 14:59:49 +02:00
diminator
5c3d57ff3a
Merged in AD-604-non-owner-cannot-download-pdfs-an (pull request #19 )
...
Ad 604 non owner cannot download pdfs an
2015-07-23 15:33:54 +02:00
diminator
c415e97e42
allow download for non-renderable files
2015-07-23 15:18:58 +02:00
vrde
21f3b4504e
Fix height for audio and video embed
2015-07-23 15:04:02 +02:00
TimDaubenschuetz
90b0047eb8
Merged in AD-610-on-switching-edition-detail-coa-d (pull request #17 )
...
Flush store after unmounting coa component to force refresh on new user request
2015-07-23 14:35:09 +02:00
TimDaubenschuetz
da7be7bb06
Merged in AD-589-Form-Cancel-doesnt-reset (pull request #16 )
...
Form cancel doesnt reset property/form
2015-07-22 15:19:25 +02:00
Tim Daubenschütz
c3a1b9b626
Flush store after unmounting coa component to force refresh on new user request
2015-07-22 15:16:56 +02:00
diminator
742c1bc6e0
coa fixes and bug report
2015-07-22 00:30:51 +02:00
diminator
62bdf97a2f
cleanup of SPOOL old code
2015-07-21 21:13:46 +02:00
Tim Daubenschütz
550a2d9e58
Property:
...
- update initialValue when Property has been save successfully to enable consecutive cancel + save actions
Private Note:
- Made private note non-required
2015-07-21 16:23:50 +02:00
diminator
e7d85d6eb8
updated thumbnails:
...
- support multiformat
- runs in celery (way faster registration!)
updated s3 url generation:
- anonymous "/DEPLOYMENT/USER_ID_MD5/PIECE_FILE_HASH/CATEGORY/FILENAME.EXT"
- refactored code
!!!!install postgres hstore extension
sudo apt-get install postgresql postgresql-contrib
sudo su - postgres
psql mysite_db -c 'create extension hstore;'
./manage.py migrate
2015-07-21 15:52:58 +02:00
Tim Daubenschütz
44f63dace1
fix coa issue and hopefully header bug
2015-07-17 23:28:59 +02:00
Tim Daubenschütz
18a37057e5
fix edition id that was breaking viewport on mobile
2015-07-17 10:36:42 +02:00
Tim Daubenschütz
ee6d2789ed
set csrftokens as constants
2015-07-16 18:17:45 +02:00
Tim Daubenschütz
39ec4c5b91
fix wrong feedback for deleting an edition
2015-07-16 11:50:52 +02:00
Tim Daubenschütz
943c7503ea
fix edition creation display bug on piece detail
2015-07-16 11:39:05 +02:00
vrde
0065c3d792
Fix bug in polling
2015-07-15 18:00:43 +02:00
Tim Daubenschütz
170bfcfe83
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-15 17:22:39 +02:00
Tim Daubenschütz
f3ea3460bb
reload piece list after clicking on create editions
2015-07-15 17:22:28 +02:00
vrde
a70857e8d0
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-15 17:14:18 +02:00
vrde
e19a20a60f
add polling to piece
2015-07-15 17:13:45 +02:00
Tim Daubenschütz
fe91cc4f6a
fix edition refresh after delete
2015-07-15 17:02:59 +02:00
Tim Daubenschütz
725e79bc4f
Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 16:55:38 +02:00
Tim Daubenschütz
cbfbde262f
fix fineuploader bug when clicking the add files button in a form
2015-07-15 16:50:32 +02:00
diminator
4edc728278
merged
2015-07-15 15:00:39 +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
diminator
9ba30f0938
acl_unshare false for prize
...
piece prize details
num_submissions
2015-07-15 12:23:02 +02:00
vrde
3ad7763577
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
...
Conflicts:
js/components/ascribe_detail/media_container.js
2015-07-15 12:21:31 +02:00
vrde
26e0957840
Fix progress bar for video encoding
2015-07-15 12:18:29 +02:00
Tim Daubenschütz
a8dd915ad7
basically reverting media player changes
2015-07-15 11:47:14 +02:00
Tim Daubenschütz
cc0301f5e5
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 11:43:10 +02:00
Tim Daubenschütz
26fc2f14b3
make media container robust
2015-07-15 11:43:04 +02:00
diminator
a86befb2d7
fixed signup serializer, acl_editions_view
...
piece container whitelabel
2015-07-15 11:39:08 +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
5a0663ea14
unshare and delete functionality + store updates for all views
2015-07-14 16:29:01 +02:00
Tim Daubenschütz
cc89475d0c
add routine to refresh specific edition list
2015-07-14 14:45:33 +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
9b663c64b2
Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from-
2015-07-14 12:19:41 +02:00
diminator
e0eb31d1de
transfer + withdraw
2015-07-14 11:42:09 +02:00
Tim Daubenschütz
f729e3c833
add acl proxy component
2015-07-14 11:11:28 +02:00
diminator
9a7bf46675
acl WIP
2015-07-13 23:57:16 +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
Tim Daubenschütz
ad6dd40867
Merge branch 'master' into AD-419-decouple-piece-registration-from-
2015-07-13 15:31:44 +02:00
Tim Daubenschütz
733c95a070
loading feedback for piece and edition page
2015-07-13 15:21:09 +02:00
Tim Daubenschütz
3ae10c5e50
first cut loading spinner pieces
2015-07-13 15:00:12 +02:00
Tim Daubenschütz
11545c13a6
reorder edition collapsible paragraphs
2015-07-13 14:30:24 +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
b58fe51722
fixed crowdcurity issues on login/email/requestpassword
...
num editions supports status: -1, 0, >0
2015-07-10 16:45:49 +02:00
Tim Daubenschütz
62ae8fd08b
fix warnings
2015-07-10 14:15:22 +02:00
diminator
8f78de3fb4
editions styling
...
fix otherdata
collapsible styling
2015-07-09 18:46:53 +01:00
diminator
9aa81433a6
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:24 +01: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
diminator
8ac26275f5
piece view
2015-07-08 22:54:07 +02:00
diminator
d5ce1ecde2
bug fix
2015-07-07 15:56:35 +02:00
diminator
4a2ad0ea9d
piece registration without editions
2015-07-07 15:48:09 +02:00