Brett Sun
4b91b58adf
Merge branch 'AD-1313-Attach-thumbnail-to-piece-in-register-form' into AD-1360-show-common-upload-errors-to-user
2015-11-25 10:18:40 +01:00
Brett Sun
3e28d6f421
Add functionality to match known errors
...
Implemented as part of AD-1360 and AD-1378 as a way to match an error
situation to a known class of errors so that we can modify behaviour or
show pretty text to the user.
2015-11-23 17:12:47 +01:00
Tim Daubenschütz
62d7a5863a
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
2015-11-20 16:20:24 +01:00
Tim Daubenschütz
bccfc0906f
Revert super funny-"Important minor fix"
...
We better want this not to go live
This reverts commit b77fefb55c
2015-11-20 16:17:08 +01:00
Tim Daubenschütz
e4479dc95b
qMerge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
2015-11-20 14:00:36 +01:00
Tim Daubenschütz
0946ddc0b3
Minor fix
2015-11-20 14:00:10 +01:00
Tim Daubenschütz
f4f89bba43
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
2015-11-20 13:53:03 +01:00
Tim Daubenschütz
3a234e42ec
Merge branch 'master' of github.com:ascribe/onion
2015-11-20 10:21:35 +01:00
Tim Daubenschütz
b77fefb55c
Important minor fix
2015-11-20 10:21:21 +01:00
Cevo
63a32d949a
transfer added
2015-11-19 19:47:33 +01:00
Tim Daubenschütz
399f670bed
Add variety of supported file formats & fix bug when parsing mime type
2015-11-18 17:55:27 +01:00
Tim Daubenschütz
971d42b36d
Add file-format-specific call to action for thumbnail generation
2015-11-17 15:46:46 +01:00
Tim Daubenschütz
ed3624198a
Merge branch 'master' into AD-1309-change-share-to-email
...
Conflicts:
js/components/ascribe_buttons/acls/acl_button.js
2015-11-16 16:55:33 +01:00
Tim Daubenschütz
339421a4b7
Merge branch 'master' into AD-56-add-social-share-functionality
...
Conflicts:
js/components/ascribe_detail/media_container.js
js/components/ascribe_media/media_player.js
2015-11-16 15:54:49 +01:00
Tim Daubenschütz
286dd114af
Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
...
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Brett Sun
00d93d912b
Move 3rd party api urls to AppConstants
2015-11-13 13:33:27 +01:00
Brett Sun
f3b0b4ffc1
Adjust info text for email
2015-11-10 19:35:42 +01:00
Brett Sun
3cfa65cb82
Change instances of "Share" to be "Email"
2015-11-10 11:53:05 +01:00
Brett Sun
8dc0470007
Add Twitter button
2015-11-09 19:01:27 +01:00
Tim Daubenschütz
9ae6b10add
Finalizing basic submission flow with lazy evaluated form
2015-11-09 17:52:09 +01:00
Brett Sun
d972da935a
Add Facebook Share button
2015-11-09 17:46:49 +01:00
Tim Daubenschütz
f5a5e045a6
Finalize boilerplate for portfolioreview subdomain
2015-11-06 15:18:46 +01:00
Brett Sun
56eff0d9ed
Improve DRYness of acl buttons
...
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
2015-11-06 15:10:29 +01: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
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
ca03fca14a
Insert new information constants
2015-10-20 15:13:34 +02:00
TimDaubenschuetz
9dec5eab1d
Merged in AD-744-search-filter-not-working-i-type- (pull request #97 )
...
Ad 744 search filter not working i type
2015-10-15 15:16:33 +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
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
Tim Daubenschütz
002bab8e79
Increase additional data file size
2015-10-13 10:13:53 +02:00
Tim Daubenschütz
f57125184d
Merge remote-tracking branch 'origin/master' into AD-744-search-filter-not-working-i-type-
2015-10-12 17:35:48 +02:00
Tim Daubenschütz
6d36be5311
Add documentation for SearchBar and put threshold into AppConstants
2015-10-12 17:10:04 +02:00
diminator
cda81b6f5b
withdraw consign
...
and acl buttonlist in detail refactor
2015-09-29 18:09:34 +02:00
Tim Daubenschütz
4302da2f81
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
2015-09-23 14:22:09 +02:00
Tim Daubenschütz
90d6ec20f6
Revert "Revert "acls on 3 levels""
...
This reverts commit c02d1ea3ac
2015-09-22 17:38:25 +02:00
Tim Daubenschütz
c02d1ea3ac
Revert "acls on 3 levels"
...
This reverts commit f1bc400faf
2015-09-22 17:29:07 +02:00
diminator
f1bc400faf
acls on 3 levels
...
whitelabel
user
piece
the higher on the list, the more power (whitelabel overrides user and piece)
2015-09-22 17:23:19 +02:00
Tim Daubenschütz
31ffc4262a
change text in signup form
2015-09-22 11:41:10 +02:00
diminator
b24d4608dd
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-16 15:59:07 +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
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
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
Tim Daubenschütz
f78dbf9e1a
Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
...
Conflicts:
js/components/ascribe_forms/property.js
2015-09-14 14:23:36 +02:00
Tim Daubenschütz
e087e9f332
PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js
2015-09-14 11:36:24 +02:00
Tim Daubenschütz
356483f9ca
Fix bug for resetting non-native HTML inputs in form
2015-09-14 10:49:45 +02:00
diminator
9ad713f781
merge 456
2015-09-08 14:42:51 +02:00
diminator
22aa0139ae
terms and conditions page with accept/deny
...
Needed: copyright societies in backend
2015-09-07 12:03:59 +02:00
Cevo
501d7ac7c0
now committing the remove contract
2015-09-07 11:38:23 +02:00
Cevo
ae21686f26
slash added to route
2015-09-07 10:23:39 +02:00
