diminator
|
22aa0139ae
|
terms and conditions page with accept/deny
Needed: copyright societies in backend
|
2015-09-07 12:03:59 +02:00 |
|
diminator
|
1611a75036
|
Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col
Conflicts:
ownership/serializers.py
|
2015-09-04 16:48:00 +02:00 |
|
diminator
|
4bdab3410e
|
contractagreementserializer with contract fully expanded
|
2015-09-04 14:48:10 +02:00 |
|
diminator
|
8a49006592
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-04 11:51:17 +02:00 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +02:00 |
|
Cevo
|
eb4994b05e
|
add more
|
2015-09-03 18:25:12 +02:00 |
|
diminator
|
6a1f58fdb4
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-03 17:37:40 +02:00 |
|
diminator
|
73ee0753c1
|
refactored notifications per detail
|
2015-09-03 17:25:22 +02:00 |
|
Cevo
|
57c4076c1e
|
pushing the contract u[pdate on client side
|
2015-09-03 17:19: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
|
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 |
|
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
|
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 |
|
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 |
|
Tim Daubenschütz
|
d9f3f2a9d7
|
rename contract_form to form_contract
|
2015-08-28 15:55:39 +02:00 |
|
Tim Daubenschütz
|
02ed21fef5
|
fix nav links on logged out user
|
2015-08-28 15:31:12 +02:00 |
|
Tim Daubenschütz
|
848321a3f3
|
fix nav links on logged out user
|
2015-08-28 15:29:30 +02:00 |
|
diminator
|
762c3f89b9
|
Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col
|
2015-08-28 15:25:43 +02:00 |
|
diminator
|
d3cc6a5007
|
request actions first cut
|
2015-08-28 15:24:32 +02:00 |
|
Tim Daubenschütz
|
ddfc8b9621
|
minor fixes
|
2015-08-28 14:27:02 +02:00 |
|
Tim Daubenschütz
|
8e7aeab3a6
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-08-28 14:08:45 +02:00 |
|
Tim Daubenschütz
|
52ae348e57
|
dynamic acl for acl_submit
|
2015-08-28 14:07:29 +02:00 |
|
diminator
|
02e105d2b8
|
text refactor
|
2015-08-28 14:00:50 +02:00 |
|
diminator
|
1b730573c7
|
ikonotv acl_submitted + refactor
|
2015-08-28 13:58:24 +02:00 |
|
diminator
|
680cc8572f
|
ikonotv acl_submit
|
2015-08-28 13:52:58 +02:00 |
|