Tim Daubenschütz
|
989b121678
|
Fix mangling issue
|
2015-06-15 08:44:44 +02:00 |
|
Tim Daubenschütz
|
7d5780d62a
|
add another troubleshooting section
|
2015-06-12 10:14:34 +02:00 |
|
vrde
|
05b9792d3f
|
Add some new constants to the app
|
2015-06-10 17:28:36 +02:00 |
|
vrde
|
7aca8ba0fc
|
Merge branch 'master' into AD-436-route-to-django-or-jsapp
|
2015-06-10 15:43:04 +02:00 |
|
vrde
|
4ada116585
|
Add missing semicolon
|
2015-06-10 15:42:35 +02:00 |
|
vrde
|
f91b27d2a8
|
FFFUUUUU I cannot markdown
|
2015-06-10 15:37:42 +02:00 |
|
vrde
|
49d458d304
|
Fix README.md
|
2015-06-10 15:35:24 +02:00 |
|
vrde
|
b9c8002495
|
Add ENV variable to handle BASE_URL
|
2015-06-09 17:53:44 +02:00 |
|
vrde
|
5445698eea
|
[wip] add temporary base url
|
2015-06-09 16:10:25 +02:00 |
|
Tim Daubenschütz
|
669f2b3ae7
|
resolve merge conflict
|
2015-06-09 13:38:01 +02:00 |
|
Tim Daubenschütz
|
296176572e
|
add different kinds of notifications
|
2015-06-09 13:36:09 +02:00 |
|
Tim Daubenschütz
|
d3fc902411
|
add que functionality to globalnotification
|
2015-06-09 12:08:14 +02:00 |
|
Tim Daubenschütz
|
e0e75151e0
|
add first working prototype
|
2015-06-08 18:14:25 +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
|
38a476f7e8
|
Enable compression
|
2015-06-08 17:26:27 +02:00 |
|
vrde
|
798fa1c38a
|
disable compression
|
2015-06-08 17:23:10 +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
|
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
|
98d26f5ed7
|
fix minor checkbox bug
|
2015-06-08 14:13:35 +02:00 |
|
Tim Daubenschütz
|
b2241c0551
|
fix bulk action modal formating
|
2015-06-08 14:01:47 +02:00 |
|
Tim Daubenschütz
|
1b52864f3e
|
remove testing from watch process
|
2015-06-08 13:55:55 +02:00 |
|
Tim Daubenschütz
|
6d337890d0
|
merge conflict
|
2015-06-08 13:47:24 +02:00 |
|
Tim Daubenschütz
|
cea111c25e
|
solve conflict
|
2015-06-08 11:51:49 +02:00 |
|
Tim Daubenschütz
|
e2ab0c1a5c
|
format stuff
|
2015-06-08 11:50:40 +02:00 |
|
Tim Daubenschütz
|
793e1a78ca
|
add tests for generalutils
|
2015-06-08 11:19:18 +02:00 |
|
vrde
|
38ab68b599
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-06-08 10:14:14 +02:00 |
|
vrde
|
a2cf18986d
|
Update readme with workaround for CORS extension
|
2015-06-08 10:13:48 +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
|
851d42e1d9
|
quick fix
|
2015-06-05 16:23:16 +02:00 |
|
Tim Daubenschütz
|
95f4efa92d
|
merge conflict
|
2015-06-05 16:21:36 +02:00 |
|
Tim Daubenschütz
|
443829320f
|
add personal note to piece detail page
|
2015-06-05 16:20:28 +02:00 |
|
Tim Daubenschütz
|
3a812e531d
|
fix search bug
|
2015-06-05 15:17:35 +02:00 |
|
Tim Daubenschütz
|
7f82d49278
|
resolve merge
|
2015-06-05 14:29:37 +02:00 |
|
Tim Daubenschütz
|
76a41a23b9
|
add details to piece detail page
|
2015-06-05 14:22:02 +02:00 |
|
vrde
|
25181db07e
|
Merge branch 'AD-412-mediaplayer'
|
2015-06-05 14:21:25 +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 |
|
Tim Daubenschütz
|
ae4428795d
|
integrate es6lint
|
2015-06-05 09:17:41 +02:00 |
|
vrde
|
8f65aa7a2d
|
Add "other" type display
|
2015-06-04 17:37:46 +02:00 |
|
Tim Daubenschütz
|
c177b95f45
|
responsive table
|
2015-06-04 17:28:14 +02:00 |
|
vrde
|
ff6855970e
|
Still working on image preview
|
2015-06-04 17:23:40 +02:00 |
|