diminator
|
b4e8e3d9dc
|
ws for progress bar
|
2015-10-06 10:03:00 +02:00 |
|
Tim Daubenschütz
|
6102ed3bb4
|
update react textarea autosize
|
2015-09-21 16:10:25 +02:00 |
|
Tim Daubenschütz
|
801227cfee
|
remove react-progress-bar for react-bootstrap progressbar
|
2015-09-09 14:11:52 +02:00 |
|
Tim Daubenschütz
|
9aa47a5de4
|
open localhost.com:3000 instead of localhost:3000
|
2015-08-31 17:55:27 +02:00 |
|
Tim Daubenschütz
|
b4f68f23e8
|
update react-datepicker DO NPM INSTALL
|
2015-08-26 18:03:58 +02:00 |
|
Tim Daubenschütz
|
1620437c86
|
add defaultValue to inputdate
|
2015-08-12 13:53:17 +02:00 |
|
diminator
|
f5b34222a9
|
remove ratings from master branch
|
2015-08-10 17:45:49 +02:00 |
|
diminator
|
a6e257bd27
|
Merged in AD-545-add-rating-support-for-the-pieces (pull request #36)
Ad 545 add rating support for the pieces
|
2015-08-10 17:08:11 +02:00 |
|
diminator
|
a27415eb86
|
jury dashboard + rating WIP
|
2015-08-10 15:23:13 +02:00 |
|
Tim Daubenschütz
|
f3e378f221
|
update react-bootstrap first cut
|
2015-08-05 16:49:25 +02:00 |
|
Tim Daubenschütz
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +02:00 |
|
diminator
|
1a1f14e04c
|
add JS file hashing to fineuploader
didnt instantiate it because needs UX
|
2015-07-23 11:45:25 +02:00 |
|
Tim Daubenschütz
|
af42bb8e67
|
error handling first cut
|
2015-07-17 15:41:09 +02:00 |
|
Tim Daubenschütz
|
909e9db0b8
|
add polyfill
|
2015-07-03 10:40:04 +02:00 |
|
vrde
|
c2c0fd3ab8
|
Add audio player
|
2015-07-02 18:27:09 +02:00 |
|
diminator
|
ddabedfb73
|
browserify-shim
|
2015-06-25 14:47:29 +02:00 |
|
ddejongh
|
3f3e9a273f
|
git removed s3-fineuploader
|
2015-06-23 10:27:19 +02:00 |
|
ddejongh
|
9e1a76a08e
|
api settings complete
|
2015-06-22 17:33:25 +02:00 |
|
ddejongh
|
e1dbc0e183
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 14:05:56 +02:00 |
|
ddejongh
|
efc7f6d46b
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 13:13:37 +02:00 |
|
ddejongh
|
b4c2cd73a5
|
Merge remote-tracking branch 'remotes/origin/master' into AD-416-account-settings-page-navbar
Conflicts:
.gitmodules
node_modules/react-s3-fineuploader
|
2015-06-19 09:52:27 +02:00 |
|
ddejongh
|
fabff2922c
|
account settings
|
2015-06-17 17:48:23 +02:00 |
|
Tim Daubenschütz
|
82ceba614e
|
finish including react-s3-fineuploader as a git submodule
|
2015-06-17 16:52:40 +02:00 |
|
vrde
|
b9c8002495
|
Add ENV variable to handle BASE_URL
|
2015-06-09 17:53:44 +02:00 |
|
vrde
|
f732cec523
|
Merge branch 'AD-432-put-onion-online'
Conflicts:
gulpfile.js
package.json
|
2015-06-08 18:00:17 +02:00 |
|
vrde
|
c4fee2880f
|
Enable compression
|
2015-06-08 17:20:08 +02:00 |
|
vrde
|
54b996db90
|
Move build dep form "defDependencies" to "dependencies"
See
https://devcenter.heroku.com/articles/nodejs-support#customizing-the-build-process
|
2015-06-08 15:58:59 +02:00 |
|
vrde
|
9f2019e168
|
Add tasks to put code in production
|
2015-06-08 15:42:28 +02:00 |
|
vrde
|
a1bfbb8f86
|
[wip] add server to serve app
|
2015-06-08 15:24:58 +02:00 |
|
Tim Daubenschütz
|
cea111c25e
|
solve conflict
|
2015-06-08 11:51:49 +02:00 |
|
Tim Daubenschütz
|
b1973d3a64
|
finish integrating jest testing suite
|
2015-06-08 09:53:14 +02:00 |
|
Tim Daubenschütz
|
82bea4c241
|
integrate jest - not working yet though
|
2015-06-05 16:57:56 +02:00 |
|
Tim Daubenschütz
|
443829320f
|
add personal note to piece detail page
|
2015-06-05 16:20:28 +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
|
ae4428795d
|
integrate es6lint
|
2015-06-05 09:17:41 +02:00 |
|
Tim Daubenschütz
|
95c199bed6
|
resolve cluster-merge-fuck
|
2015-06-02 17:32:38 +02:00 |
|
Tim Daubenschütz
|
88fe43b3e2
|
add es6-promise to package.json
|
2015-06-02 09:00:05 +02:00 |
|
vrde
|
f50d28be98
|
Refactor fetch, WIP
|
2015-06-01 14:22:04 +02:00 |
|
ddejongh
|
d90a4f97db
|
loan
|
2015-06-01 13:02:53 +02:00 |
|
Tim Daubenschütz
|
fe78f30dc8
|
remove cdn bootstrap and integrate bootstrap-sass. PLZ DO NPM INSTALL
|
2015-05-29 12:02:37 +02:00 |
|
Tim Daubenschütz
|
78d61dd1d6
|
integrate libsass and refactoring css files
|
2015-05-29 11:45:10 +02:00 |
|
ddejongh
|
b8ffac4275
|
merge table branch
|
2015-05-29 09:20:01 +02:00 |
|
Tim Daubenschütz
|
64793cd90b
|
remove npm start scripts, add gulp for build and watch, add source maps
|
2015-05-26 19:16:30 +02:00 |
|
ddejongh
|
230ecfb0e4
|
modal try 1
|
2015-05-26 16:46:02 +02:00 |
|
Tim Daubenschütz
|
29d9572a37
|
upgrade alt version. Please do npm install and check if altjs is at version 0.16.5
|
2015-05-22 11:25:21 +02:00 |
|
Tim Daubenschütz
|
adb4c72253
|
Remove superagent, add isomorphic fetch instead again, add constants as well as utility functions
|
2015-05-19 13:45:19 +02:00 |
|
vrde
|
f189851355
|
Add uglifyjs as dependency
|
2015-05-18 16:35:08 +02:00 |
|
Tim Daubenschütz
|
4d7198fab9
|
integrated react-router
|
2015-05-15 15:38:25 +02:00 |
|
Tim Daubenschütz
|
2b8f46cb8c
|
resolving merge conflict #2
|
2015-05-15 15:27:23 +02:00 |
|