1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-24 02:16:10 +01:00
Commit Graph

21 Commits

Author SHA1 Message Date
diminator
890a312eff merge 2015-07-14 17:46:19 +02:00
diminator
982b701a5c Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from-
Conflicts:
	js/components/ascribe_detail/edition.js
2015-07-14 17:45:39 +02:00
diminator
9fa9db8352 consign/unconsign 2015-07-14 17:42:15 +02:00
Tim Daubenschütz
5a0663ea14 unshare and delete functionality + store updates for all views 2015-07-14 16:29:01 +02:00
Tim Daubenschütz
cc89475d0c add routine to refresh specific edition list 2015-07-14 14:45:33 +02:00
diminator
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +02:00
diminator
fd2f99f1b0 acl indexof 2015-07-13 20:16:08 +02:00
Tim Daubenschütz
e71c2f9fe0 separate create edition form logic 2015-07-13 17:09:44 +02:00
Tim Daubenschütz
ad6dd40867 Merge branch 'master' into AD-419-decouple-piece-registration-from- 2015-07-13 15:31:44 +02:00
Tim Daubenschütz
11545c13a6 reorder edition collapsible paragraphs 2015-07-13 14:30:24 +02:00
diminator
a07bc9e0e2 piece + share
acl first cut
2015-07-13 14:10:46 +02:00
diminator
b58fe51722 fixed crowdcurity issues on login/email/requestpassword
num editions supports status: -1, 0, >0
2015-07-10 16:45:49 +02:00
Tim Daubenschütz
62ae8fd08b fix warnings 2015-07-10 14:15:22 +02:00
diminator
8f78de3fb4 editions styling
fix otherdata
collapsible styling
2015-07-09 18:46:53 +01:00
diminator
9aa81433a6 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
Conflicts:
	js/components/ascribe_detail/edition.js
2015-07-09 14:59:24 +01:00
diminator
bf0a36f2a3 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
Conflicts:
	js/components/ascribe_detail/edition.js
2015-07-09 14:59:16 +01:00
diminator
fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
Conflicts:
	js/components/ascribe_detail/edition.js
2015-07-09 14:54:11 +01:00
diminator
9fd4c1a6fd otherdata and extradata on a piece level and templated in frontend 2015-07-09 13:37:33 +01:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00
diminator
d5ce1ecde2 bug fix 2015-07-07 15:56:35 +02:00
diminator
4a2ad0ea9d piece registration without editions 2015-07-07 15:48:09 +02:00