1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

93 Commits

Author SHA1 Message Date
diminator
ea9fb306c4 add request action loan to piece 2015-08-21 16:22:08 +02:00
diminator
edec430109 public and private note in edition and piece
connection in frontend
2015-08-21 15:04:38 +02:00
Tim Daubenschütz
116cb9c2fc fix disappearing fineuploader in additional data 2015-08-21 14:07:10 +02:00
Tim Daubenschütz
09c0451c86 Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
Conflicts:
	js/components/ascribe_detail/further_details_fileuploader.js
2015-08-21 11:34:47 +02:00
Tim Daubenschütz
3b46dbb9f5 add upload busy function to fineuploader 2015-08-21 11:11:31 +02:00
Tim Daubenschütz
30d57a943f fix lock form 2015-08-21 11:01:13 +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
Tim Daubenschütz
ad8be7e34a separate pre-sending form submission functionality 2015-08-18 13:15:22 +02:00
diminator
fc82c866fb cyland refactor
whitelabel + cyland app
2015-08-17 20:52:36 +02:00
diminator
12dde0458c Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page 2015-08-17 09:56:55 +02:00
diminator
d24b325062 bug fix loadPiece 2015-08-13 14:16:44 +02:00
diminator
97c298e304 piece navigation prev next WIP 2015-08-12 16:47:16 +02:00
Tim Daubenschütz
d5dc164810 boilerplate for loan process 2015-08-12 13:34:41 +02:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00
diminator
bdeef598eb Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r'
Conflicts:
	js/components/settings_container.js
2015-08-10 17:07:15 +02:00
Tim Daubenschütz
5be771f6ac add inline property to form 2015-08-10 14:15:32 +02:00
Tim Daubenschütz
3afb036f24 rename apiUrls to ApiUrls 2015-08-07 15:08:02 +02:00
vrde
e9c776fec4 Add "s" to http lol 2015-08-07 14:23:59 +02:00
Tim Daubenschütz
192f776bd8 Filter open edition tables correctly 2015-08-07 13:05:50 +02:00
Tim Daubenschütz
17b991e06b adjust store calls to fetch list to new interface 2015-08-04 11:48:12 +02:00
vrde
72821001b7 Merge branch 'AD-601-in-piece_detail-longer-titles-are'
Conflicts:
	.gitignore
2015-08-03 13:44:53 +02:00
Tim Daubenschütz
52f10f178f Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are 2015-07-30 11:49:48 +02:00
Tim Daubenschütz
79bef1e0a9 add ellipsis functionality to detail property 2015-07-30 11:48:47 +02:00
diminator
bab29d6ffa Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do'
Conflicts:
	js/components/ascribe_forms/form_loan.js
2015-07-29 15:55:16 +02:00
Tim Daubenschütz
9ebc489c78 refresh piece list correctly after piece with edition creation 2015-07-29 15:24:30 +02:00
diminator
deebacd063 Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22)
Ad 601 in piece_detail longer titles are
2015-07-29 14:16:40 +02:00
Tim Daubenschütz
275f6c839e minor fixes 2015-07-27 18:24:21 +02:00
Tim Daubenschütz
1a1ba8bbb1 add ellipsis again 2015-07-27 18:19:55 +02:00
Tim Daubenschütz
a05698efc1 fix app crashing bug when transferring an edition 2015-07-27 14:59:49 +02:00
diminator
5c3d57ff3a Merged in AD-604-non-owner-cannot-download-pdfs-an (pull request #19)
Ad 604 non owner cannot download pdfs an
2015-07-23 15:33:54 +02:00
diminator
c415e97e42 allow download for non-renderable files 2015-07-23 15:18:58 +02:00
vrde
21f3b4504e Fix height for audio and video embed 2015-07-23 15:04:02 +02:00
TimDaubenschuetz
90b0047eb8 Merged in AD-610-on-switching-edition-detail-coa-d (pull request #17)
Flush store after unmounting coa component to force refresh on new user request
2015-07-23 14:35:09 +02:00
TimDaubenschuetz
da7be7bb06 Merged in AD-589-Form-Cancel-doesnt-reset (pull request #16)
Form cancel doesnt reset property/form
2015-07-22 15:19:25 +02:00
Tim Daubenschütz
c3a1b9b626 Flush store after unmounting coa component to force refresh on new user request 2015-07-22 15:16:56 +02:00
diminator
742c1bc6e0 coa fixes and bug report 2015-07-22 00:30:51 +02:00
diminator
62bdf97a2f cleanup of SPOOL old code 2015-07-21 21:13:46 +02:00
Tim Daubenschütz
550a2d9e58 Property:
- update initialValue when Property has been save successfully to enable consecutive cancel + save actions

Private Note:

- Made private note non-required
2015-07-21 16:23:50 +02:00
diminator
e7d85d6eb8 updated thumbnails:
- support multiformat
- runs in celery (way faster registration!)

updated s3 url generation:
- anonymous "/DEPLOYMENT/USER_ID_MD5/PIECE_FILE_HASH/CATEGORY/FILENAME.EXT"
- refactored code

!!!!install postgres hstore extension
sudo apt-get install postgresql postgresql-contrib
sudo su - postgres
psql mysite_db -c 'create extension hstore;'
./manage.py migrate
2015-07-21 15:52:58 +02:00
Tim Daubenschütz
44f63dace1 fix coa issue and hopefully header bug 2015-07-17 23:28:59 +02:00
Tim Daubenschütz
18a37057e5 fix edition id that was breaking viewport on mobile 2015-07-17 10:36:42 +02:00
Tim Daubenschütz
ee6d2789ed set csrftokens as constants 2015-07-16 18:17:45 +02:00
Tim Daubenschütz
39ec4c5b91 fix wrong feedback for deleting an edition 2015-07-16 11:50:52 +02:00
Tim Daubenschütz
943c7503ea fix edition creation display bug on piece detail 2015-07-16 11:39:05 +02:00
vrde
0065c3d792 Fix bug in polling 2015-07-15 18:00:43 +02:00
Tim Daubenschütz
170bfcfe83 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-15 17:22:39 +02:00
Tim Daubenschütz
f3ea3460bb reload piece list after clicking on create editions 2015-07-15 17:22:28 +02:00
vrde
a70857e8d0 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-15 17:14:18 +02:00