Tim Daubenschütz
|
756480e4cf
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k'
|
2015-07-15 17:03:26 +02:00 |
|
Tim Daubenschütz
|
fe91cc4f6a
|
fix edition refresh after delete
|
2015-07-15 17:02:59 +02:00 |
|
vrde
|
d4bb23467e
|
Fix link to terms
|
2015-07-15 16:57:41 +02:00 |
|
Tim Daubenschütz
|
725e79bc4f
|
Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 16:55:38 +02:00 |
|
Tim Daubenschütz
|
06c2e6205c
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 16:55:27 +02:00 |
|
Tim Daubenschütz
|
7d9d2ed6b5
|
fix edition creation
|
2015-07-15 16:55:04 +02:00 |
|
Tim Daubenschütz
|
cbfbde262f
|
fix fineuploader bug when clicking the add files button in a form
|
2015-07-15 16:50:32 +02:00 |
|
vrde
|
970bbf819a
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-'
|
2015-07-15 15:59:12 +02:00 |
|
diminator
|
5f7b7db00f
|
Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
Conflicts:
bitcoin/models.py
web/settings_env/live.py
|
2015-07-15 15:54:37 +02:00 |
|
diminator
|
af5964e68c
|
Merged in AD-419-decouple-piece-registration-from- (pull request #10)
Ad 419 decouple piece registration from
|
2015-07-15 15:06:36 +02:00 |
|
diminator
|
8953d0bfa7
|
Merge remote-tracking branches 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' and 'remotes/origin/AD-516-add-ga' into AD-419-decouple-piece-registration-from-
|
2015-07-15 15:04:18 +02:00 |
|
diminator
|
4edc728278
|
merged
|
2015-07-15 15:00:39 +02:00 |
|
vrde
|
48aa6caacf
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 14:52:23 +02:00 |
|
vrde
|
344fffad91
|
Add language support
|
2015-07-15 14:52:14 +02:00 |
|
diminator
|
44f0b36e73
|
Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-
|
2015-07-15 14:51:36 +02:00 |
|
Tim Daubenschütz
|
1509c520a4
|
finalizing loan form
|
2015-07-15 14:48:51 +02:00 |
|
diminator
|
049a5a6fcb
|
prize extra data form detail
|
2015-07-15 14:36:25 +02:00 |
|
Tim Daubenschütz
|
81aeb478b7
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 14:06:03 +02:00 |
|
Tim Daubenschütz
|
9cc12ab841
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 14:03:28 +02:00 |
|
Tim Daubenschütz
|
795a268184
|
loan form styling and loan contract store
|
2015-07-15 14:03:23 +02:00 |
|
diminator
|
d03f98af76
|
loan url
|
2015-07-15 14:02:33 +02:00 |
|
diminator
|
c54bbe231f
|
width styling of forms
|
2015-07-15 13:20:34 +02:00 |
|
diminator
|
9ba30f0938
|
acl_unshare false for prize
piece prize details
num_submissions
|
2015-07-15 12:23:02 +02:00 |
|
vrde
|
3ad7763577
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
Conflicts:
js/components/ascribe_detail/media_container.js
|
2015-07-15 12:21:31 +02:00 |
|
vrde
|
26e0957840
|
Fix progress bar for video encoding
|
2015-07-15 12:18:29 +02:00 |
|
Tim Daubenschütz
|
92644c285e
|
change wording for landing page
|
2015-07-15 11:54:20 +02:00 |
|
Tim Daubenschütz
|
a8dd915ad7
|
basically reverting media player changes
|
2015-07-15 11:47:14 +02:00 |
|
Tim Daubenschütz
|
cc0301f5e5
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 11:43:10 +02:00 |
|
Tim Daubenschütz
|
26fc2f14b3
|
make media container robust
|
2015-07-15 11:43:04 +02:00 |
|
diminator
|
a86befb2d7
|
fixed signup serializer, acl_editions_view
piece container whitelabel
|
2015-07-15 11:39:08 +02:00 |
|
Tim Daubenschütz
|
e3e8f088c7
|
add licences for cc
|
2015-07-15 11:28:53 +02:00 |
|
Tim Daubenschütz
|
ea871f3d1d
|
acl for delete
|
2015-07-15 01:46:37 +02:00 |
|
vrde
|
9e7e9782d6
|
Add google analytics
|
2015-07-15 01:45:03 +02:00 |
|
Tim Daubenschütz
|
71d2d5b641
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 01:43:07 +02:00 |
|
Tim Daubenschütz
|
f1e90795f0
|
specify editions generically by whitelabel
|
2015-07-15 01:40:48 +02:00 |
|
diminator
|
d97b219c2d
|
licenses
|
2015-07-15 01:35:12 +02:00 |
|
Tim Daubenschütz
|
e1af4c615f
|
aclproxy for view editions
|
2015-07-15 01:02:53 +02:00 |
|
Tim Daubenschütz
|
0351b6fce4
|
remove id from submission
|
2015-07-15 00:59:22 +02:00 |
|
Tim Daubenschütz
|
ebfd4339ab
|
change prize submission to new backend route
|
2015-07-15 00:57:31 +02:00 |
|
Tim Daubenschütz
|
07f4cdd2e1
|
advance prize submission form
|
2015-07-15 00:52:16 +02:00 |
|
Tim Daubenschütz
|
0b9383576c
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 00:41:04 +02:00 |
|
Tim Daubenschütz
|
5e90f3cac7
|
remove buggy close button
|
2015-07-15 00:40:51 +02:00 |
|
vrde
|
45a49cafe9
|
Fix bug with getLangText
|
2015-07-15 00:37:45 +02:00 |
|
Tim Daubenschütz
|
e65f052ffe
|
rename prize_name to prize
|
2015-07-15 00:16:43 +02:00 |
|
Tim Daubenschütz
|
6385349846
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-15 00:14:52 +02:00 |
|
Tim Daubenschütz
|
56389a542e
|
override api_urls and fix wording
|
2015-07-15 00:14:17 +02:00 |
|
Tim Daubenschütz
|
188f8ebf9c
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
|
2015-07-14 23:54:00 +02:00 |
|
Tim Daubenschütz
|
07dce25fe7
|
add functionality for submit to prize button and fix delete button
|
2015-07-14 23:53:49 +02:00 |
|
vrde
|
6c85d43cfc
|
Rebuild
|
2015-07-14 23:53:42 +02:00 |
|
vrde
|
5e0473c8fd
|
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k'
|
2015-07-14 23:42:23 +02:00 |
|