Tim Daubenschütz
|
81f28a02f9
|
Merge branch 'master' into AD-1342-Public-piece-note-doesnt-render-correctly-def-data-null
|
2015-12-02 16:39:18 +01:00 |
|
Brett Sun
|
2381bd22ac
|
Change nested destructuring formatting
|
2015-12-02 16:05:21 +01:00 |
|
Tim Daubenschütz
|
d01acea9ce
|
Nicer formatting for long parametrized function
|
2015-12-02 14:34:31 +01:00 |
|
Tim Daubenschütz
|
123e2a4d13
|
Add functionality to avoid sending error messages to sentry
|
2015-12-02 14:31:42 +01:00 |
|
Brett Sun
|
07834414c7
|
Set default name for marketplace wallets to be 'Market' until the white label name loads
|
2015-12-02 14:26:15 +01:00 |
|
Brett Sun
|
916ec7aace
|
Rearrange handleDrop() to flow more naturally
|
2015-12-02 13:52:17 +01:00 |
|
Tim Daubenschütz
|
fe24a5e15a
|
Remove all occurrences of inactivity mgmt of ReactS3Fineuploader
|
2015-12-02 12:37:21 +01:00 |
|
Tim Daubenschütz
|
8b3060d613
|
Fix simple comments in pr
|
2015-12-02 12:25:11 +01:00 |
|
Tim Daubenschütz
|
85340a9126
|
Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay
|
2015-12-02 12:23:38 +01:00 |
|
Tim Daubenschütz
|
4fe10bb887
|
Cosmetic changes for EditionContainer & PieceContainer
|
2015-11-30 18:26:27 +01:00 |
|
Tim Daubenschütz
|
0b2bc1c57b
|
Introduce ReactError mixin for handling errors in React components
|
2015-11-30 18:23:03 +01:00 |
|
Tim Daubenschütz
|
68f41f7550
|
Implement boilerplate logic for ReactError
|
2015-11-30 15:01:07 +01:00 |
|
Tim Daubenschütz
|
5a6c827f0b
|
Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/ascribe_detail/piece_container.js
|
2015-11-30 15:00:39 +01:00 |
|
Tim Daubenschütz
|
2b6c9777e9
|
Display actions only if ACLs are available
|
2015-11-30 13:20:05 +01:00 |
|
Tim Daubenschütz
|
6500af121a
|
Merge pull request #36 from ascribe/AD-706-close-expandable-navigation-after-click
Bug fix for collapsing nav
|
2015-11-30 11:59:47 +01:00 |
|
Brett Sun
|
b4ddec3427
|
Merge with AD-1443
|
2015-11-30 11:46:57 +01:00 |
|
Brett Sun
|
3aab73379a
|
Merge with master
|
2015-11-30 11:43:33 +01:00 |
|
Brett Sun
|
3d017392c1
|
Only use previous filterBy on refreshing edition lists if no filterBy argument was given
Also fix the behaviour of refresh using the list’s current length
rather than the previous page size.
|
2015-11-30 11:32:48 +01:00 |
|
Brett Sun
|
ea52c54e3a
|
Fix check for determining if a piece's edition list is open
|
2015-11-30 11:27:15 +01:00 |
|
Brett Sun
|
539c34db48
|
Fix typo for getDefaultProps() in consign form
|
2015-11-30 11:19:59 +01:00 |
|
Brett Sun
|
0c02c033e5
|
Fix consign form when labels aren't give as props
|
2015-11-27 23:53:54 +01:00 |
|
Dimitri De Jonghe
|
a21e450a93
|
Merge pull request #39 from ascribe/AD-1403-api-webhooks
webhooks in settings page
|
2015-11-27 18:04:41 +01:00 |
|
diminator
|
d03d1355ff
|
copy for webhooks
|
2015-11-27 18:02:25 +01:00 |
|
Brett Sun
|
5137fa01a9
|
Add note for navBar state hack
|
2015-11-27 14:13:30 +01:00 |
|
Tim Daubenschütz
|
7146f00c05
|
Refactor webhooks: add source, clear state on create hide create on no items left
|
2015-11-27 13:36:42 +01:00 |
|
diminator
|
1c25f8e776
|
webhooks in settings without acl
|
2015-11-27 03:24:37 +01:00 |
|
Cevo
|
e482caaa99
|
public note is visible outside
|
2015-11-25 21:43:15 +01:00 |
|
Tim Daubenschütz
|
88d1edd45c
|
Add pageExitWarning for SlidesContainer
|
2015-11-25 15:01:23 +01:00 |
|
Tim Daubenschütz
|
64030473cd
|
Merge pull request #33 from ascribe/AD-1270-piece-detail-hangs-on-empty-piece-title
Check for piece and edition validity by using their ids instead of titles
|
2015-11-25 11:25:42 +01:00 |
|
Tim Daubenschütz
|
5423f5dcd7
|
Bug fix for collapsing nav
|
2015-11-25 11:16:09 +01:00 |
|
Brett Sun
|
c270977eb9
|
Fix default filter on piece list
|
2015-11-24 19:26:45 +01:00 |
|
Brett Sun
|
e228a4bf15
|
Dynamically get marketplace name for submit button
|
2015-11-24 18:18:49 +01:00 |
|
Brett Sun
|
47f56b5505
|
Add 23vivi to app costs
|
2015-11-24 18:17:51 +01:00 |
|
Brett Sun
|
2e03ab584a
|
Fix api endpoints
|
2015-11-24 18:17:38 +01:00 |
|
Brett Sun
|
a72fea5db4
|
Add 23vivi routes
|
2015-11-24 12:08:37 +01:00 |
|
Brett Sun
|
ee61369d46
|
Update market api endpoints
|
2015-11-24 12:04:18 +01:00 |
|
Brett Sun
|
f7b55e56a9
|
Split Lumenus into a generic market wallet for 23vivi
|
2015-11-24 12:04:08 +01:00 |
|
Brett Sun
|
efdc5d32e7
|
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
|
2015-11-24 10:42:15 +01:00 |
|
Tim Daubenschütz
|
e4cafd4bc3
|
Fix bug in FB button component & simplify injectHead util
|
2015-11-23 19:02:28 +01:00 |
|
Brett Sun
|
5e45c10baa
|
Check for piece and edition validity by using their ids instead of titles
Also removed a few unnecessary location props.
|
2015-11-23 10:46:20 +01:00 |
|
Tim Daubenschütz
|
bccfc0906f
|
Revert super funny-"Important minor fix"
We better want this not to go live
This reverts commit b77fefb55c1a84b026d5365cd8150d4fb175f7e4.
Conflicts:
js/constants/application_constants.js
|
2015-11-20 16:17:08 +01:00 |
|
Tim Daubenschütz
|
0946ddc0b3
|
Minor fix
|
2015-11-20 14:00:10 +01:00 |
|
Cevo
|
dc96e908eb
|
piece note hidden from non-owner
|
2015-11-20 11:47:41 +01:00 |
|
Cevo
|
c0e0354ce8
|
fixing the public note bug
|
2015-11-20 11:11: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
|
24f5d4de2b
|
Merge branch 'master' of github.com:ascribe/onion
|
2015-11-19 17:51:27 +01:00 |
|
Tim Daubenschütz
|
446ed311ea
|
Fix upload/hashing button in FileDragAndDropDialog
|
2015-11-19 17:51:17 +01:00 |
|
diminator
|
c1f1573f27
|
change impressum to imprint
|
2015-11-19 17:35:25 +01:00 |
|