vrde
|
3ac5cc5dde
|
Merge branch 'master' into piece-detail-mediaplayer
Conflicts:
js/components/ascribe_table/table_item_subtable.js
js/components/edition.js
|
2015-05-29 11:22:19 +02:00 |
|
ddejongh
|
c3ea9aecbe
|
form framework
- inputtext, area, btn
- alertmixin
- formmixin
- 500
- transfer/share
|
2015-05-29 01:54:56 +02:00 |
|
vrde
|
df95e75025
|
WIP
|
2015-05-27 17:34:33 +02:00 |
|
ddejongh
|
3c3504d773
|
modal error
|
2015-05-27 17:33:15 +02:00 |
|
ddejongh
|
76317dcdca
|
modal + forms
|
2015-05-27 15:53:26 +02:00 |
|
ddejongh
|
8624eb26c7
|
sharemodal view
|
2015-05-27 09:34:49 +02:00 |
|
ddejongh
|
3a103c1d99
|
modal try 1
|
2015-05-26 16:52:53 +02:00 |
|
ddejongh
|
d685d68d15
|
modal try 1
|
2015-05-26 16:46:50 +02:00 |
|
ddejongh
|
230ecfb0e4
|
modal try 1
|
2015-05-26 16:46:02 +02:00 |
|
ddejongh
|
e3c115897f
|
refactored edition properties
|
2015-05-26 15:31:28 +02:00 |
|
ddejongh
|
dc33c74da6
|
edition loads in detail
|
2015-05-26 14:58:11 +02:00 |
|
ddejongh
|
bcf8756cd3
|
edition
|
2015-05-26 13:48:46 +02:00 |
|
ddejongh
|
497e43005e
|
Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup
Conflicts:
css/main.css
js/components/ascribe_table/table_item_subtable.js
|
2015-05-26 13:48:00 +02:00 |
|