1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-29 00:58:03 +02:00
Commit Graph

75 Commits

Author SHA1 Message Date
Brett Sun
8fce04125f Merge with master 2016-02-08 14:08:54 +01:00
Brett Sun
8009174787 Change AccordionListItems and parents for loading UserStore from top level app 2016-01-11 19:06:50 +01:00
Tim Daubenschütz
61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
Tim Daubenschütz
f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
diminator
dc8599830b updated glyphs, accordion pieces ok 2015-10-09 13:14:29 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
diminator
b7aaa9a4cf collection page + footer 2015-10-08 20:26:29 +02:00
Tim Daubenschütz
f9393c5bb3 Remove all unneccessary react-router imports 2015-10-01 14:36:56 +02:00
diminator
bc28f3d8f5 loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
diminator
d5efd79d14 refactored accordion list item:
accordion-list-item
accordion-list-item-piece < accordion-list-item
accordion-list-item-wallet < accordion-list-item-piece
accordion-list-item-prize < accordion-list-item-piece
2015-08-11 12:06:01 +02:00
diminator
36356dd5c5 Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- 2015-08-05 14:52:18 +02:00
diminator
5ce549e533 disable submit prize with ACL 2015-08-04 13:15:38 +02:00
Tim Daubenschütz
17b991e06b adjust store calls to fetch list to new interface 2015-08-04 11:48:12 +02:00
Tim Daubenschütz
1a1ba8bbb1 add ellipsis again 2015-07-27 18:19:55 +02:00
Tim Daubenschütz
c2d76034af add flowtype functionality for piece list 2015-07-22 17:20:40 +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
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +02:00
Tim Daubenschütz
8cad3b521b fix globals lint errors and edition creation - 0 editions - bug 2015-07-17 10:30:05 +02:00
Tim Daubenschütz
fb609afd28 loading feedback for edition button 2015-07-15 17:32:51 +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
Tim Daubenschütz
e3e8f088c7 add licences for cc 2015-07-15 11:28:53 +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
e65f052ffe rename prize_name to prize 2015-07-15 00:16:43 +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
Tim Daubenschütz
8f386dc0cf adjust acl proxy 2015-07-14 22:34:34 +02:00
Tim Daubenschütz
373aa89041 fix bulk action refresh bug and add better feedback for edition creation 2015-07-14 13:58:33 +02:00
diminator
1b3f614c80 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 2015-07-13 23:59:07 +02:00
diminator
9a7bf46675 acl WIP 2015-07-13 23:57:16 +02:00
Tim Daubenschütz
b238fbeeb1 fix piece list error 2015-07-13 23:29:07 +02:00
Tim Daubenschütz
463f205a6e finalized: separation of edition creation and edition form 2015-07-13 18:52:55 +02:00
Tim Daubenschütz
e71c2f9fe0 separate create edition form logic 2015-07-13 17:09:44 +02:00
Tim Daubenschütz
6372a5af20 adjusted frontend to use first_edition from piece directly 2015-07-13 15:28:28 +02:00
Tim Daubenschütz
3ae10c5e50 first cut loading spinner pieces 2015-07-13 15:00:12 +02:00
Tim Daubenschütz
fd094aa471 remove first edition routine 2015-07-13 14:49:39 +02:00
Tim Daubenschütz
b51a03ce9c styling changes 2015-07-13 14:19:22 +02:00
Tim Daubenschütz
3dd5626eb9 fix polling bug 2015-07-13 10:07:22 +02:00
Tim Daubenschütz
f7618d18f5 fix stateful polling of editions 2015-07-10 19:11:57 +02:00
Tim Daubenschütz
cbb965c264 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list 2015-07-10 19:01:21 +02:00
Tim Daubenschütz
104a72fcc9 generic polling 2015-07-10 19:00:59 +02:00
diminator
62289be5ce polling for editions 2015-07-10 18:51:35 +02:00
Tim Daubenschütz
fd6fad5da3 correct number of editions 2015-07-10 14:48:55 +02:00
Tim Daubenschütz
1df068d75f add edition creation functionality 2015-07-10 13:54:25 +02:00
Tim Daubenschütz
ca72168da2 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list 2015-07-10 10:32:42 +02:00
Tim Daubenschütz
bcb1bbe29b first cut edition creation in piece list item 2015-07-10 10:32:39 +02:00
diminator
22b201f388 register piece returns to piece detail 2015-07-10 10:30:17 +02:00
Tim Daubenschütz
2e8e86c62f add boilerplate code for creating an edition 2015-07-09 17:56:27 +02:00
Tim Daubenschütz
5f459aa139 add dynamic links to piece list item depending on wether editions exist or not 2015-07-09 17:28:21 +02:00
Tim Daubenschütz
d051198676 add loading feedback to new edition toggle 2015-07-09 17:01:08 +02:00
Tim Daubenschütz
773d42a3b8 add firstEdition to a piece 2015-07-09 15:44:20 +02:00