Tim Daubenschütz
|
7c376b7229
|
PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants
|
2015-09-16 15:14:08 +02:00 |
|
Tim Daubenschütz
|
f78dbf9e1a
|
Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
Conflicts:
js/components/ascribe_forms/property.js
|
2015-09-14 14:23:36 +02:00 |
|
Tim Daubenschütz
|
e087e9f332
|
PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js
|
2015-09-14 11:36:24 +02:00 |
|
Tim Daubenschütz
|
356483f9ca
|
Fix bug for resetting non-native HTML inputs in form
|
2015-09-14 10:49:45 +02:00 |
|
diminator
|
9ad713f781
|
merge 456
|
2015-09-08 14:42:51 +02:00 |
|
diminator
|
22aa0139ae
|
terms and conditions page with accept/deny
Needed: copyright societies in backend
|
2015-09-07 12:03:59 +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 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +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 |
|
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
|
19726560ba
|
bitbucket test
|
2015-09-02 14:39:32 +02:00 |
|
Tim Daubenschütz
|
96fdb598f7
|
change api endpoints to contractblobs
|
2015-08-31 17:29:43 +02:00 |
|
Tim Daubenschütz
|
dd20afff90
|
rename LoanContract to Contract
|
2015-08-28 16:18:10 +02:00 |
|
diminator
|
79106dd106
|
loan request + answer complete
|
2015-08-27 11:38:21 +02:00 |
|
diminator
|
b2fed6426f
|
loan request up till accept
|
2015-08-26 09:50:38 +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
|
edec430109
|
public and private note in edition and piece
connection in frontend
|
2015-08-21 15:04:38 +02:00 |
|
diminator
|
8ae7edaa1c
|
ikonotv initial setup
|
2015-08-18 12:08:01 +02:00 |
|
diminator
|
fc82c866fb
|
cyland refactor
whitelabel + cyland app
|
2015-08-17 20:52:36 +02:00 |
|
Tim Daubenschütz
|
eb6e3cb20a
|
finishing boilerplate for wallet app + prefixing whitelabel specific files
|
2015-08-11 14:47:28 +02:00 |
|
Tim Daubenschütz
|
f086bece71
|
add boilerplate code for wallet application
|
2015-08-11 13:10:15 +02:00 |
|
Tim Daubenschütz
|
95e0b256b6
|
Merge branch 'master' into AD-613-cyland-white-label-page
Conflicts:
.gitignore
|
2015-08-11 11:50:09 +02:00 |
|
Tim Daubenschütz
|
3afb036f24
|
rename apiUrls to ApiUrls
|
2015-08-07 15:08:02 +02:00 |
|
diminator
|
792325f71d
|
acl_create_editions
|
2015-08-05 16:02:48 +02:00 |
|
Tim Daubenschütz
|
4f2aa430f2
|
refactor ascribe table and add prizes dashboard boilerplate code
|
2015-07-29 18:03:49 +02:00 |
|
Tim Daubenschütz
|
277cd98549
|
fix cyland logo
|
2015-07-29 16:08:30 +02:00 |
|
Tim Daubenschütz
|
f0d6eaa950
|
update gitignore
|
2015-07-29 15:57:48 +02:00 |
|
diminator
|
3142e00ea5
|
Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do
|
2015-07-28 12:13:40 +02:00 |
|
vrde
|
4d93e076df
|
Add third party modules to handle tracking without polluting the code
|
2015-07-27 18:06:02 +02:00 |
|
diminator
|
1504a5b20d
|
inputcheckbox and terms checking
|
2015-07-27 14:39:19 +02:00 |
|
Tim Daubenschütz
|
af42bb8e67
|
error handling first cut
|
2015-07-17 15:41:09 +02:00 |
|
Tim Daubenschütz
|
8e38e9e8de
|
rename csrftoken
|
2015-07-16 19:16:26 +02:00 |
|
Tim Daubenschütz
|
ee6d2789ed
|
set csrftokens as constants
|
2015-07-16 18:17:45 +02:00 |
|
diminator
|
50d1f54051
|
edition loan
piece delete
|
2015-07-15 16:56:11 +02:00 |
|
Tim Daubenschütz
|
1509c520a4
|
finalizing loan form
|
2015-07-15 14:48:51 +02:00 |
|
diminator
|
d03f98af76
|
loan url
|
2015-07-15 14:02:33 +02:00 |
|
Tim Daubenschütz
|
f1e90795f0
|
specify editions generically by whitelabel
|
2015-07-15 01:40:48 +02:00 |
|
Tim Daubenschütz
|
56389a542e
|
override api_urls and fix wording
|
2015-07-15 00:14:17 +02:00 |
|
vrde
|
63c78d09d9
|
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 22:43:03 +02:00 |
|
Tim Daubenschütz
|
5ae80efaa7
|
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 21:18:32 +02:00 |
|
Tim Daubenschütz
|
483e24b234
|
add missing language strings
|
2015-07-14 21:18:05 +02:00 |
|
vrde
|
c5fd8aa28f
|
Add custom url mapping
|
2015-07-14 21:15:10 +02:00 |
|
vrde
|
5ced62c496
|
Cleanup constants
|
2015-07-14 20:06:13 +02:00 |
|
Tim Daubenschütz
|
ff64734545
|
styling
|
2015-07-14 17:41:57 +02:00 |
|
Tim Daubenschütz
|
5ef63fbba3
|
use local whitelabel constants for route switching
|
2015-07-14 17:12:32 +02:00 |
|
Tim Daubenschütz
|
8d15238818
|
add subdomain settings to constants
|
2015-07-14 16:53:27 +02:00 |
|