github.com/oTree-org/oTree commits | Ecosyste.ms: OpenCollective

merged changes from 'full'

4731e6ac46a6dd35b4bd44813933e081ac205965 authored almost 2 years ago by Chris <[email protected]>

include_sibling

aebc342fb4a9dc0b72c1f7514a6f64e602b37bae authored almost 2 years ago by Chris <[email protected]>

merged changes from 'full'

325b574a1d6a4ba90c4e807fd8bf6f107d02db8a authored over 2 years ago by oTree-org <[email protected]>

remove requirements_base

b3a0a54ba1c31257e24ef1ddfa6a9172a9365454 authored over 2 years ago by oTree-org <[email protected]>

Currency -> cu

2d1d88839883df148673a2cd259556e66a8825ba authored over 2 years ago by oTree-org <[email protected]>

bump requirements

60d1752076067b6cb170c9babbda02caf335959d authored almost 3 years ago by oTree-org <[email protected]>

bump requirements

cbe93274e5f93f0663c6e791c9fb72b8c399a9b5 authored almost 3 years ago by oTree-org <[email protected]>

merge

d7948ec428b424e36e6d15be94cc833859a8d5cf authored almost 3 years ago by oTree-org <[email protected]>

upcase_constants

288268a75d7932fe4be5b235870a22ad603cde7c authored about 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

0cc5c4bda95936cf34e1f56c38ff789f6c8ce365 authored about 3 years ago by oTree-org <[email protected]>

fix common_value_auction

45c36940c2751c2664009ba9e231a718c27bc4c3 authored about 3 years ago by oTree-org <[email protected]>

.

2d650e3de199ba336132cd8bbc6183ede78d41da authored about 3 years ago by oTree-org <[email protected]>

update common_value_auction

3e76426fb35d9cc996e7b30f4fd36fac825386e1 authored about 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

b9e453b8dc1109a0f992017291ba1f4d64f47957 authored about 3 years ago by oTree-org <[email protected]>

prisoner payoffs

2b971e513abf9371f4e7042912a585314a571996 authored about 3 years ago by oTree-org <[email protected]>

change PD to use boolean & simpler matrix

24329a3638ed7daa91127a85fe23212824ba2d58 authored about 3 years ago by oTree-org <[email protected]>

.

1eb1954924d2d63334db1bdd3db6a3294f15633d authored over 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

7bd4ccde65e055601768177550e6c542dac032ed authored over 3 years ago by oTree-org <[email protected]>

fix .gitignore for otreezip

67ed4c78b9f26fe5ec525d0bc042238c9116fc70 authored over 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

8b286b4fbee8b63bd13f42e624af718fde208548 authored over 3 years ago by oTree-org <[email protected]>

remove public_goods

da78d37f7fc8be72d1dac7e53fbf4daae4df613b authored over 3 years ago by oTree-org <[email protected]>

remove public_goods

d01adfee7cfcf7fa0f5a8cfa04d2b6e8a3b3dea3 authored over 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

c5686b0f2fef952bd74c1a0c73607bd3a6afa677 authored over 3 years ago by oTree-org <[email protected]>

remove public_goods (redundant with public_goods_simple, and studio compat issue (get_or_none)

aa87e87e8a872b3d508dcf88ab1632646d9da808 authored over 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

1cada6bc675e391010dfb6dd5738ca04df059bc0 authored over 3 years ago by oTree-org <[email protected]>

remove c=Currency

ec85669ff110419c4b79a860d0c8bbf6a3f6a5a7 authored over 3 years ago by oTree-org <[email protected]>

add PARTICIPANT_FIELDS

f12b67f8eb059ecac0d1f251ed0857375da2c6f3 authored over 3 years ago by oTree-org <[email protected]>

merged changes from 'full'

ae4b3d0d95d6c192e15ce15a9a04d8e55b6f596a authored almost 4 years ago by oTree-org <[email protected]>

c -> cu

be5cfcbe45544baa221adf291be116843a421edd authored almost 4 years ago by oTree-org <[email protected]>

merged

98ca9952b1575701710f8959a1411c786a688fb8 authored almost 4 years ago by oTree-org <[email protected]>

{% %} -> {{ }}

03772b2c517e0ab1575cc289cf748d02551d37fb authored almost 4 years ago by oTree-org <[email protected]>

remove {% extends %}

2fa9d28648eebfbf7ccf70fc4ea6fcecc726dcad authored almost 4 years ago by oTree-org <[email protected]>

merged changes from 'full'

d1ec144e0f19018e6c90b11e3e4964f891827a4d authored almost 4 years ago by oTree-org <[email protected]>

change aapa from string to function reference

83613719bc1cda8999fad95a358c7db592f3937d authored almost 4 years ago by oTree-org <[email protected]>

merged changes from 'full'

c7a98f4892d45a73d98083c4550d69d79173988f authored almost 4 years ago by oTree-org <[email protected]>

from otree.api import *; c = Currency

bb5869233ab2c624d735eddf9720879a5bdcd713 authored almost 4 years ago by oTree-org <[email protected]>

removed manage.py

9b42e591ca39b183067aed7f7f1876502a261fe1 authored almost 4 years ago by oTree-org <[email protected]>

update tests.py for __init__

492dbb51b07ffce195de4b7d55801386c796467b authored almost 4 years ago by oTree-org <[email protected]>

convert to __init__.py

45d57ec18d586f02675280ef495fb7496f66c38e authored almost 4 years ago by oTree-org <[email protected]>

strong->b

a451c93caa03f5a6bb5f030338d39950916f47f8 authored almost 4 years ago by oTree-org <[email protected]>

requirements.txt

24cf4f594a9d8a3ace1a939b903fd051ed8153fd authored almost 4 years ago by oTree-org <[email protected]>

replace settings.py

03b2dde959cb055e841bae88b41806fdaabed3a5 authored almost 4 years ago by oTree-org <[email protected]>

ignore .otreezip

cb570e2a4a9cb08f2ebef5990a73380f3e32d752 authored almost 4 years ago by oTree-org <[email protected]>

template indentation and spacing

68a3793686e8f58160956779f37a2c663e143e0f authored almost 4 years ago by oTree-org <[email protected]>

template indentation and spacing

a0b495fec1cf4aa8068ac8f565fcc4e51a58b137 authored almost 4 years ago by oTree-org <[email protected]>

remove {% load otree %}

2a8f1349268432396a6cd8dc7426b4938cf4267e authored almost 4 years ago by oTree-org <[email protected]>

group = self.group

2bcf0c6813f4249e0db61ac57fa107abd3aa25df authored almost 4 years ago by oTree-org <[email protected]>

manual fixes to get bots passing on noself format

b37b4ac75462a1c910fd3a6ab76b0418d8a63685 authored almost 4 years ago by oTree-org <[email protected]>

.

b33b305b21770d02a2018e155ecd13a792896cda authored almost 4 years ago by oTree-org <[email protected]>

remove_self

c2100b01f1c2c5b396efc6ba73ad3d94cfd022be authored almost 4 years ago by oTree-org <[email protected]>

delet obsolete file

239d9c504096137d2e4b8b9ea41ed49744b2ce4a authored about 4 years ago by oTree-org <[email protected]>

.

34c48aeae8739b148c564319439e323880da08ac authored about 4 years ago by oTree-org <[email protected]>

add comment to requirements_base.txt

75d57372eed9c008bb204fec40aa6a909af3ee54 authored about 4 years ago by oTree-org <[email protected]>

new format for requirements.txt

e98656e474db032447c6a7d3b11a4c74c077cc2d authored about 4 years ago by oTree-org <[email protected]>

remove role() again

42f7dce01c946161fae1cb6747fea0aebff1a3fb authored about 4 years ago by oTree-org <[email protected]>

fix missing role() method

bd6871d3914761ffcfba44c03c77371aed094df7 authored about 4 years ago by oTree-org <[email protected]>

role() changes

48f432ff223047aeccc716280863e863d2a744fa authored about 4 years ago by oTree-org <[email protected]>

use {% formfields %} instead of {% formfield player.foo %} everywhere

4f2716abb557d2e416f79b80fb8dadd3c3fdb5bd authored about 4 years ago by oTree-org <[email protected]>

move SESSION_CONFIGS to the top of settings.py

515183d5744beb270271ebd8fc874b201f7c4628 authored over 4 years ago by oTree-org <[email protected]>

Procfile change runprodserver to prodserver

dac70534382ef2055acfc15c2c9fa53f832871b0 authored over 4 years ago by oTree-org <[email protected]>

_builtin: WaitPage should have self.player

347964b4ed9024bb8af7386caebf7b3d21790409 authored over 4 years ago by oTree-org <[email protected]>

updated bots format

bb89a73345015996601212b3df2629457e92109e authored almost 5 years ago by oTree-org <[email protected]>

in progress updating bots format

79a2f39e0d3907b84dcec6de2f30202666362d43 authored almost 5 years ago by oTree-org <[email protected]>

in progress updating bots format

8fa4988a690124a72facfcda2769760d5cf70304 authored almost 5 years ago by oTree-org <[email protected]>

update aapa format

7b35e28cbe302ee10b84474699279631cf1cc38e authored about 5 years ago by oTree-org <[email protected]>

.

631889e5d12fda9162755cc85b954de18f5dc639 authored about 5 years ago by oTree-org <[email protected]>

.

245b20f49c7feb9ed69657ceed326c80cf6c82db authored about 5 years ago by oTree-org <[email protected]>

.gitignore

64399a9a1f0a9c7dedea3fc63281d69988e25c87 authored about 5 years ago by oTree-org <[email protected]>

format with black

3fc7aa4440723e337051c63cf3b6f432b1276ae9 authored about 5 years ago by oTree-org <[email protected]>

get rid of 'instructions' class, use bootstrap m-3

8a70d52e3f7e17e285ba07728e27bef9dae930c8 authored about 5 years ago by oTree-org <[email protected]>

get rid of instructions css class

07c6ee0e1631c4d64fe9182775dcf8cca71e626a authored about 5 years ago by oTree-org <[email protected]>

reformat with black, bump requirements

adebb7c30ede13c8d4701b7223360181245bc4f7 authored about 5 years ago by oTree-org <[email protected]>

.

789fb2c2681aa5fbb8385f2f65a633e02592b225 authored about 5 years ago by oTree-org <[email protected]>

aapa_v2

b2d951e4fdf8c76f806ab8645f5e22c7da976d07 authored about 5 years ago by oTree-org <[email protected]>

deactivate session configs

38b876bec9d02e1f825fe95a4eb0a910491928df authored over 5 years ago by oTree-org <[email protected]>

full list of games

dd27cbc35a99ecbd9a2806b675c12743d3130977 authored over 5 years ago by oTree-org <[email protected]>

some games were missing 'import random' in methods

4f87a213d924eb9e5a5ab19f2959c9e9ed1822b7 authored over 5 years ago by oTree-org <[email protected]>

bugfixes

d66548812dbbc2884c732d941d220e4740615a5c authored over 5 years ago by oTree-org <[email protected]>

change dict literal to constructor in pages.py and settings.py

3f4796ad46f138e3eb0f7f9b1dd179061baf5a2a authored over 5 years ago by oTree-org <[email protected]>

move validation methods to models, delete real_effort

cb16f2c2273e14737d636149c8e8622147f8d7c6 authored over 5 years ago by oTree-org <[email protected]>

lowercase instructions?

bc209223a03855b01089265cd0e0f9a8eac594d4 authored almost 6 years ago by oTree-org <[email protected]>

remove unsupported features

eb3d9d3fca8d02af5483b6417476f3ed19f2051e authored almost 6 years ago by oTree-org <[email protected]>

initial

e3ea4332f664c17286d22fd0bccf47e5da7b3d47 authored almost 6 years ago by oTree-org <[email protected]>