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

27 Commits

Author SHA1 Message Date
diminator
6013303bd6 Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
	js/components/ascribe_buttons/button_submit_close.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	sass/ascribe_media_player.scss
	sass/main.scss
2015-09-10 17:45:51 +02:00
Tim Daubenschütz
b5e5102ea4 replace in keyword with dot notation checking 2015-09-10 14:00:59 +02:00
diminator
73ee0753c1 refactored notifications per detail 2015-09-03 17:25:22 +02:00
diminator
9334251fd3 notifications on piece details (www, ikono, cyland) and edition details 2015-09-03 15:17:12 +02:00
Tim Daubenschütz
ddfc8b9621 minor fixes 2015-08-28 14:27:02 +02:00
Tim Daubenschütz
52ae348e57 dynamic acl for acl_submit 2015-08-28 14:07:29 +02:00
Tim Daubenschütz
e9d0311f58 custom ikonotv piece page 2015-08-28 12:33:00 +02:00
Tim Daubenschütz
2c26aab8cc add exception for loaning a piece for ikonotv 2015-08-28 12:20:36 +02:00
diminator
bc28f3d8f5 loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
Tim Daubenschütz
6808c7c228 remove loan button from piece detail page 2015-08-26 16:44:24 +02:00
diminator
0be6b7f118 bug fix loadPiece 2015-08-24 11:01:42 +02:00
diminator
3b27238adf request form on piece level
bug fix cyland piece endpoint
bug fix otherDataUploader editable
2015-08-24 10:48:40 +02:00
diminator
7a09b863b5 switch between request action and acl buttons on piece detail page 2015-08-21 16:49:04 +02:00
diminator
33cd23d11e getlangtext 2015-08-21 16:38:18 +02:00
diminator
edec430109 public and private note in edition and piece
connection in frontend
2015-08-21 15:04:38 +02:00
diminator
5c6b753acb piece loan history 2015-08-20 15:50:30 +02:00
diminator
ffdb4847db piece bitcoin id 2015-08-20 14:01:02 +02:00
diminator
5b2ab6c1e2 bug fix acls
otherdata frontend

MIGRATE + loaddate whitelabel
2015-08-20 11:32:11 +02:00
diminator
fc82c866fb cyland refactor
whitelabel + cyland app
2015-08-17 20:52:36 +02:00
diminator
d24b325062 bug fix loadPiece 2015-08-13 14:16:44 +02:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00
vrde
0065c3d792 Fix bug in polling 2015-07-15 18:00:43 +02:00
vrde
e19a20a60f add polling to piece 2015-07-15 17:13:45 +02:00
diminator
a86befb2d7 fixed signup serializer, acl_editions_view
piece container whitelabel
2015-07-15 11:39:08 +02:00
Tim Daubenschütz
733c95a070 loading feedback for piece and edition page 2015-07-13 15:21:09 +02:00
Tim Daubenschütz
3ae10c5e50 first cut loading spinner pieces 2015-07-13 15:00:12 +02:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00