Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Brett Sun
8531b77633
Merge with master
2016-01-11 17:52:32 +01:00
diminator
2acf3f4056
Added round to prizepiece
...
upon new round:
- reset is_selected
- increment round for is_selected=True
bug fix filter on is_selected
2016-01-06 14:24:58 +01:00
Brett Sun
3aab73379a
Merge with master
2015-11-30 11:43:33 +01:00
Tim Daubenschütz
6888aaa8d9
Merge pull request #37 from ascribe/AD-1345-remind-users-not-to-leave-long-submission-form
...
Ad 1345 remind users not to leave long submission form
2015-11-27 17:34:12 +01:00
Brett Sun
3b6481eda0
Bump Rackt/History to 1.13.1
...
Gracefully handle when sessionStorage is unavailable
2015-11-26 11:45:40 +01:00
Tim Daubenschütz
121a1dbb8d
Bump react-router to 1.0.0 because of found bug
2015-11-25 15:00:56 +01:00
Brett Sun
c270977eb9
Fix default filter on piece list
2015-11-24 19:26:45 +01:00
Brett Sun
955e20d6b6
Reduce dependency footprint of new includes
...
Opted for decamelize instead of snake-case as it’s much smaller and we
don’t need the extra functionality of snake-case.
2015-11-02 18:29:06 +01:00
Brett Sun
d23331d9b9
Remove ReactS3FineUploader's dependency on react-router's location
...
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.
Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.
Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Tim Daubenschütz
b2634c5b3f
Upgrade react-router
2015-10-21 20:57:35 +02:00
Tim Daubenschütz
444de8ebd7
Remove potentially dangerous automatic upgrade for react-router
2015-10-20 17:42:19 +02:00
Tim Daubenschütz
ddf3eb18fc
update package.json
2015-10-09 14:08:47 +02:00
Tim Daubenschütz
c174b8b56c
Tighten lib-dependencies, move history into its own module
2015-10-05 11:52:23 +02:00
Tim Daubenschütz
17fd470e6b
Upgrade react-router-bootstrap
2015-10-01 14:00:56 +02:00
Tim Daubenschütz
eebe936023
Change: router rendering, router location, route configs, notFound routes, redirect routes,
2015-09-30 17:09:46 +02:00
Tim Daubenschütz
5ded1e0760
Update browserify-shim and react-router
2015-09-30 15:05:27 +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
