Brett Sun
|
b02f6d7695
|
Merge with master
|
2015-12-08 16:11:27 +01:00 |
|
Brett Sun
|
7c73b7fac7
|
Refactor InjectInHeadMixin to be a util class instead
|
2015-11-09 14:32:14 +01:00 |
|
Tim Daubenschütz
|
f6be11d530
|
remove alert mixin
|
2015-08-10 14:22:25 +02:00 |
|
Tim Daubenschütz
|
e589925c9d
|
delete form mixin
|
2015-08-10 14:05:35 +02:00 |
|
Tim Daubenschütz
|
8f9c699b69
|
Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r
Conflicts:
js/components/ascribe_buttons/submit_to_prize_button.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
|
2015-08-07 14:10:05 +02:00 |
|
Tim Daubenschütz
|
4c88f88d56
|
first cut porting and using new react-bootstrap version
|
2015-08-05 17:32:35 +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
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +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 |
|
Sylvain Bellemare
|
f066008ce9
|
translated english text to french
|
2015-07-08 09:57:50 +02:00 |
|
vrde
|
03f09b8c83
|
Rename fetch to requests to avoid name clashing
|
2015-06-16 13:48:48 +02:00 |
|
ddejongh
|
bf0a2aeefb
|
consign unconsign requests
async emails
|
2015-06-11 15:03:55 +02:00 |
|
ddejongh
|
af71196dfd
|
delete function for multi editions
|
2015-06-10 15:49:46 +02:00 |
|
ddejongh
|
509aa111ab
|
Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
gulpfile.js
added notifications
cleaned up proptypes
|
2015-06-09 16:10:38 +02:00 |
|
ddejongh
|
6563bf97b0
|
toggable textarea
|
2015-06-09 13:29:22 +02:00 |
|
Tim Daubenschütz
|
b49f3fe9f2
|
set state bug fix
|
2015-06-08 14:51:13 +02:00 |
|
Tim Daubenschütz
|
8a17208643
|
fix bulk modal bug
|
2015-06-08 14:23:19 +02:00 |
|
Tim Daubenschütz
|
1b52864f3e
|
remove testing from watch process
|
2015-06-08 13:55:55 +02:00 |
|
Tim Daubenschütz
|
7f82d49278
|
resolve merge
|
2015-06-05 14:29:37 +02:00 |
|
vrde
|
62cc6b41df
|
Lint code
|
2015-06-05 14:14:59 +02:00 |
|
vrde
|
e8627cd0a3
|
Merge branch 'master' into AD-412-mediaplayer
Conflicts:
js/components/ascribe_media/resource_viewer.js
js/components/edition_container.js
js/mixins/inject_in_head_mixin.js
package.json
|
2015-06-05 13:18:16 +02:00 |
|
vrde
|
a4b3438a2d
|
Add shmui to handle images
|
2015-06-05 13:15:31 +02:00 |
|
Tim Daubenschütz
|
a7478cdcb5
|
resolve merge conflicts
|
2015-06-05 11:40:49 +02:00 |
|
Tim Daubenschütz
|
18a2806fb1
|
minor fixes
|
2015-06-05 11:32:10 +02:00 |
|
Tim Daubenschütz
|
f987bce7cc
|
add es6lint to build process and fix most (not really) errors and warnings
|
2015-06-05 11:06:36 +02:00 |
|
vrde
|
641e8ac82d
|
Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer
Conflicts:
js/components/edition.js
js/mixins/inject_in_head_mixin.js
|
2015-06-03 17:44:13 +02:00 |
|
vrde
|
34cf9e6871
|
Add support for videos and images
|
2015-06-03 16:53:27 +02:00 |
|
Tim Daubenschütz
|
28a1c8f2d4
|
fix modal undefined bug
|
2015-06-03 11:49:39 +02:00 |
|
ddejongh
|
6078410240
|
refactored buttons
|
2015-06-03 10:27:11 +02:00 |
|
ddejongh
|
a51c27fb9f
|
loan form styled,
overlay styled
|
2015-06-02 18:43:37 +02:00 |
|
ddejongh
|
82d14b30fc
|
fixed form mixin
|
2015-06-02 18:16:18 +02:00 |
|
Tim Daubenschütz
|
95c199bed6
|
resolve cluster-merge-fuck
|
2015-06-02 17:32:38 +02:00 |
|
vrde
|
3e7a670509
|
Merge branch 'master' into piece-detail-mediaplayer
Conflicts:
js/components/edition.js
|
2015-06-02 14:00:47 +02:00 |
|
Tim Daubenschütz
|
366fcbf4f3
|
refactor general utils
|
2015-06-02 13:42:17 +02:00 |
|
ddejongh
|
dc3d024f8d
|
bulk transfer part 1
|
2015-06-02 11:38:18 +02:00 |
|
ddejongh
|
cbecbf44ad
|
bind modals to actionbuttons
|
2015-06-01 18:59:47 +02:00 |
|
vrde
|
2301373cae
|
Remove useless code
|
2015-06-01 18:00:34 +02:00 |
|
vrde
|
4ee4530029
|
Refactor fetch
|
2015-06-01 17:43:38 +02:00 |
|
ddejongh
|
3f9f133224
|
Merge remote-tracking branches 'remotes/origin/AD-51-refactor-table-to-mockup' and 'remotes/origin/piece-detail-mediaplayer' into piece-detail-setup
|
2015-06-01 15:58:37 +02:00 |
|
ddejongh
|
961b8ee58d
|
errors for non-fields, 500
removed retry
consign_form
|
2015-05-29 15:16:42 +02:00 |
|
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
|
7a18c150c7
|
merged all branches
fixed clear errors
|
2015-05-29 10:58:07 +02:00 |
|
ddejongh
|
b8ffac4275
|
merge table branch
|
2015-05-29 09:20:01 +02:00 |
|
ddejongh
|
61342a55e8
|
cleanup
|
2015-05-29 09:13:00 +02:00 |
|
ddejongh
|
c3ea9aecbe
|
form framework
- inputtext, area, btn
- alertmixin
- formmixin
- 500
- transfer/share
|
2015-05-29 01:54:56 +02:00 |
|
ddejongh
|
0a4dae850b
|
solved error + reusability refactor
|
2015-05-28 18:18:13 +02:00 |
|
vrde
|
df95e75025
|
WIP
|
2015-05-27 17:34:33 +02:00 |
|
Tim Daubenschütz
|
ca97bd9af5
|
Refactor TableColumnMixin
|
2015-05-26 14:57:32 +02:00 |
|
Tim Daubenschütz
|
fb6945914c
|
Refactor to proper TableColumnModel including model validation
|
2015-05-21 16:02:42 +02:00 |
|
vrde
|
8ee9bda37b
|
Fix spacing
|
2015-05-20 16:44:45 +02:00 |
|