1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Commit Graph

1752 Commits

Author SHA1 Message Date
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
a4e00ba89e Fix dynamic routing for react-router-bootstrap 2015-10-01 14:16:20 +02:00
Tim Daubenschütz
17fd470e6b Upgrade react-router-bootstrap 2015-10-01 14:00:56 +02:00
Tim Daubenschütz
957d0c66c9 minor fixes for last commit 2015-10-01 11:24:19 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
diminator
acd29b0cbe Merge remote-tracking branch 'remotes/origin/master' into AD-535-when-non-member-gets-work-transfe 2015-10-01 10:26:54 +02:00
diminator
708cf1b3da Merged in AD-806-webapp-users-cannot-withdraw-a-pe (pull request #88)
withdraw consign
2015-10-01 09:49:56 +02:00
diminator
b233dbb937 PR fixes 2015-10-01 09:49:01 +02:00
diminator
dfa01a0dde signup fix
consign redirect
2015-10-01 09:45:12 +02:00
vrde
7a47cf0bfe WIP, preparing styles for the new corporate identity 2015-09-30 18:58:21 +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
TimDaubenschuetz
ccc7bf9c06 Merged in AD-992-im-on-page-3-i-deleted-an-edition (pull request #86)
Ad 992 im on page 3 i deleted an edition
2015-09-30 17:48:12 +02:00
Tim Daubenschütz
eebe936023 Change: router rendering, router location, route configs, notFound routes, redirect routes, 2015-09-30 17:09:46 +02:00
diminator
bbae33a40f avoid dispatcherror when switching to signup 2015-09-30 17:07:18 +02:00
diminator
0d6e82a45d WIP signup/login redirect and redirectAuthenticated 2015-09-30 17:05:40 +02:00
Tim Daubenschütz
5ded1e0760 Update browserify-shim and react-router 2015-09-30 15:05:27 +02:00
diminator
44cf707e34 refactoring out edition_actions 2015-09-30 12:12:14 +02:00
diminator
2aef82be0b Merged in AD-772-coa-doesnt-render (pull request #89)
create CoA when not found
2015-09-30 12:03:34 +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
Tim Daubenschütz
7283ae7574 PR Feedback: Change API error handling to saver approach 2015-09-30 11:22:20 +02:00
TimDaubenschuetz
ad7f088081 Merged in AD-605-when-an-edition-or-piece-is-not-d (pull request #90)
Ad 605 when an edition or piece is not d
2015-09-30 11:15:22 +02:00
TimDaubenschuetz
662b837d5d Merged in AD-1071-naked-domain-is-not-requesting-t (pull request #85)
Write generic function for extracting subdomain and implement troughout whole app
2015-09-30 11:10:05 +02:00
Tim Daubenschütz
aa908a1c57 PR Feedback: Simplify subdomain extraction 2015-09-30 11:09:04 +02:00
Tim Daubenschütz
dc753caf87 Add getLangText to ErrorNotFoundPage 2015-09-30 11:06:42 +02:00
Cevo
28ab655505 merged again with master 2015-09-30 10:53:52 +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
Tim Daubenschütz
99d29449a3 style 404 page 2015-09-30 10:44:38 +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
ff8eb1ea06 Merged in AD-757-cc-license-info-is-ambiguous-or-m (pull request #87)
cc fixes in licenses, collection and details
2015-09-29 17:32:53 +02:00
diminator
08c3bfe7fb acl for powered_by 2015-09-29 16:48:46 +02:00
Tim Daubenschütz
90cf137c2c Integrate error page in app + whitelabel pages 2015-09-29 16:00:58 +02:00
diminator
f64fb73aa6 cc fixes in licenses, collection and details 2015-09-29 15:58:24 +02:00
Tim Daubenschütz
40095f7fbf throw javascript errors on >= 400 HTTP errors 2015-09-29 15:38:06 +02:00
Tim Daubenschütz
550eb2dc0b Add fetchPieceList to PieceListBulkModal 2015-09-29 15:23:57 +02:00
Tim Daubenschütz
d50d0faabe Write generic function for extracting subdomain and implement troughout whole app 2015-09-29 14:58:56 +02:00
diminator
8e62206a21 Merged in AD-456-bug-fix-sorting-menuitem (pull request #84)
Ad 456 bug fix sorting menuitem
2015-09-29 14:28:28 +02:00
Tim Daubenschütz
a3656410b1 Update component no PieceListStore changes 2015-09-29 14:25:30 +02:00
diminator
ec0a458189 removed console log 2015-09-29 14:14:59 +02:00
diminator
33ba4ce07f li instead of menuitem 2015-09-29 14:13:15 +02:00
diminator
c4fc6ab97f debug console log 2015-09-29 13:22: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
TimDaubenschuetz
dc71503abc Merged in AD-901-add-lint-for-scss (pull request #44)
Ad 901 add lint for scss
2015-09-29 11:37:46 +02:00
Cevo
b6cfafc917 unused css class removed 2015-09-29 11:04:20 +02:00
diminator
2205f18089 Merged in AD-456-ikonotv-branded-page-for-registra (pull request #83)
Ad 456 ikonotv branded page for registra
2015-09-29 11:03:46 +02:00
Tim Daubenschütz
df338ac746 Fix alignment for AclInformationButton 2015-09-29 10:31:13 +02:00