1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 18:13:49 +01:00
Commit Graph

1187 Commits

Author SHA1 Message Date
Cevo
5b0cbc92ad create refresh added, conflicts resolved 2015-09-08 11:57:20 +02:00
Cevo
a8fce698a6 createcontract refresh added 2015-09-08 11:53:09 +02:00
Tim Daubenschütz
ba2ebe81fd code restructuring 2015-09-08 11:44:05 +02:00
Tim Daubenschütz
2c1ad6dc46 fix bug in contract settings and expand actionpanel functionality 2015-09-08 11:19:11 +02:00
Tim Daubenschütz
38b7dcd79f finalize contract styles 2015-09-08 10:15:26 +02:00
Tim Daubenschütz
2c9370e555 restyle contract settings list 2015-09-08 10:03:20 +02:00
Cevo
86306fc089 console.log remove from requests.js 2015-09-07 16:36:31 +02:00
Cevo
66cd4a1d7b git ignore removed 2015-09-07 16:33:21 +02:00
Cevo
632c04149d tabs inserted in jsx 2015-09-07 15:43:44 +02:00
Cevo
6b9bf03941 tabs inserted in jsx 2015-09-07 15:08:01 +02:00
Cevo
1dba9196e7 tabs inserted in jsx 2015-09-07 14:30:45 +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
Cevo
f312c94eeb if there is anything else 2015-09-04 11:31:53 +02:00
Cevo
eb4994b05e add more 2015-09-03 18:25:12 +02:00
Cevo
57c4076c1e pushing the contract u[pdate on client side 2015-09-03 17:19:29 +02:00
Tim Daubenschütz
8a75e94413 fix bug 2015-09-04 16:24:29 +02:00
Tim Daubenschütz
85efa4b416 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-04 15:55:07 +02:00
Cevo
5265332901 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-03 15:53:22 +02:00
Cevo
d2f8b658af contract listing being done 2015-09-03 15:53:02 +02:00
diminator
7f39c62130 create contract and agreement 2015-09-02 16:34:43 +02:00
diminator
2450dce642 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra 2015-09-02 16:34:28 +02:00
diminator
19726560ba bitbucket test 2015-09-02 14:39:32 +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
07ce180ff7 contract form POST 2015-09-02 13:57:41 +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
bf5d1de635 update notification on request action 2015-09-01 19:14:48 +02:00
diminator
71c438ee59 close notifications dropdown after click 2015-09-01 18:38:24 +02:00
diminator
7919521578 refactor of notifications 2015-09-01 18:11:18 +02:00
Tim Daubenschütz
9d7b5cbe2a advance create contract form 2015-09-01 16:57:12 +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
b5b1e36109 nested collapsible paragraphs 2015-09-01 14:00:06 +02:00
Tim Daubenschütz
56cdcdb5c6 Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra 2015-09-01 13:30:04 +02:00
Tim Daubenschütz
af7938dbc7 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-01 09:29:58 +02:00
vrde
b6fc0e931d Update readme with doc on how to install the linter 2015-08-31 19:13:09 +02:00
vrde
d2adc7a388 Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss
Conflicts:
	sass/main.scss
2015-08-31 19:09:09 +02:00
vrde
99af814492 Lint scss 2015-08-31 19:04:47 +02:00
Tim Daubenschütz
abbaa80bac disable browsersync ghostmode by default 2015-08-31 18:05:14 +02:00
Tim Daubenschütz
9aa47a5de4 open localhost.com:3000 instead of localhost:3000 2015-08-31 17:55:27 +02:00
TimDaubenschuetz
f318b6bb3e Merged in AD-788-upon-filter-that-has-no-match-a-r (pull request #43)
integrate unfilteredPieceListCount into piece list store and list
2015-08-31 17:41:15 +02:00
Tim Daubenschütz
96fdb598f7 change api endpoints to contractblobs 2015-08-31 17:29:43 +02:00
Tim Daubenschütz
55948bc9ba integrate unfilteredPieceListCount into piece list store and list 2015-08-31 16:57:16 +02:00
Tim Daubenschütz
7e1815bb1f refactor account settings into multiple files 2015-08-31 16:36:24 +02:00
Tim Daubenschütz
ea52927eec rename uploading routes 2015-08-31 11:33:44 +02:00
Tim Daubenschütz
90f89e4498 other loan contract to contract renaming 2015-08-31 11:05:33 +02:00
vrde
3f34fc680e Get rid of ascribe-btn-gray 2015-08-28 16:40:54 +02:00
diminator
9dddf0bf21 Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col 2015-08-28 16:25:57 +02:00
Tim Daubenschütz
dd20afff90 rename LoanContract to Contract 2015-08-28 16:18:10 +02:00