Commit graph

2475 commits

Author SHA1 Message Date
Artur Paikin
04597ef3fb fix usage example 2017-07-31 12:07:22 +02:00
Artur Paikin
84e5de2cc7 merge 2017-07-31 11:57:25 +02:00
Artur Paikin
3cee06a9f3 resolve post conflict and publish
# Conflicts:
#	website/src/_posts/2017-07-golden-retriever.md
2017-07-31 11:53:52 +02:00
Artur Paikin
7f55cb04aa publish The Golden Retriever post 2017-07-31 11:50:38 +02:00
Ifedapo .A. Olarewaju
2877fdf592 update changelog 2017-07-30 18:35:03 +01:00
Ifedapo Olarewaju
3b4b5f0ccc Merge branch 'master' of github.com:transloadit/uppy 2017-07-30 18:14:30 +01:00
Ifedapo Olarewaju
62f01a7027 chores: update check auth url 2017-07-30 18:13:39 +01:00
Ifedapo .A. Olarewaju
a3c90742ae update changelog 2017-07-30 16:28:23 +01:00
Ifedapo Olarewaju
ca5ac21c87 Merge branch 'master' of github.com:transloadit/uppy 2017-07-30 15:50:40 +01:00
Ifedapo Olarewaju
44efd4aca0 refactor: update server auth url 2017-07-30 15:40:51 +01:00
Kevin van Zonneveld
ec939a97d8 Iteration on GR post 2017-07-28 18:21:54 +02:00
Artur Paikin
9b9a5a7414 changelog 2017-07-28 16:33:58 +02:00
Artur Paikin
c8ead6c358 how to try fix 2017-07-28 16:33:52 +02:00
Artur Paikin
eba8523845 update post, update photo, update video 2017-07-28 16:23:38 +02:00
AJvanLoon
01c2a5b7ff Removed an a 2017-07-28 14:22:38 +02:00
AJvanLoon
c666f99a45 Some polish 2017-07-28 14:20:30 +02:00
Artur Paikin
2d388cb0ea figure.wide for videos too 2017-07-27 16:28:43 +02:00
Artur Paikin
d50c2fc5c2 optimize images 2017-07-27 16:28:30 +02:00
Artur Paikin
5e6c80ccb4 update post typography, add video, improve images 2017-07-27 16:28:05 +02:00
Artur Paikin
34921231c9 add Golden Retriever demo video 2017-07-27 16:05:41 +02:00
Kevin van Zonneveld
991b5fc1c7 Forgot to remove this 2017-07-26 17:50:24 +02:00
Kevin van Zonneveld
6d315699d4 Better(?) title 2017-07-26 17:50:24 +02:00
Kevin van Zonneveld
75539405b9 Explain about trade-offs 2017-07-26 17:50:24 +02:00
Ifedapo Olarewaju
e188fba0de fix: get debug option 2017-07-26 12:05:16 +01:00
Kevin van Zonneveld
c53595b4ce iteration time 2017-07-26 12:50:24 +02:00
Kevin van Zonneveld
0fe858d6ea Ran: npm i hope this is okay? feel free to revert 2017-07-26 09:49:39 +02:00
Artur Paikin
527ec4ad64 add Golden Retriever post draft 2017-07-26 02:42:27 +02:00
Artur Paikin
d98a38199b Merge pull request #272 from transloadit/server-error
refactor: use uppy informer for server errors
2017-07-26 01:29:54 +02:00
Renée Kooi
6ea8597958
changelog: #250 was merged 2017-07-25 15:47:24 +02:00
Renée Kooi
8565df6e97
changelog: add things to backlog 2017-07-25 15:45:46 +02:00
Kevin van Zonneveld
2398d1c574 Merge branch 'master' into server-error 2017-07-25 13:58:01 +02:00
Ifedapo Olarewaju
1bbfa13fe6 docs: update changelog 2017-07-25 02:19:54 +01:00
Ifedapo Olarewaju
9f771f83c5 refactor: use uppy informer for server errors 2017-07-25 02:03:09 +01:00
Renée Kooi
6af8bb774d
xhrupload: Fix default HTTP method. 2017-07-24 18:38:32 +02:00
Renée Kooi
c012fc8fea
Update lockfile
Adding all the `requires` stuff from npm 5.3.0 or so.
2017-07-24 16:28:05 +02:00
Artur Paikin
4da840b241 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	CHANGELOG.md
2017-07-24 16:26:09 +02:00
Artur Paikin
b8bbc63410 changelog 2017-07-24 16:24:47 +02:00
Ifedapo .A. Olarewaju
7b1b0fdc4e update changelog 2017-07-24 07:39:49 +01:00
Alexander Zaytsev
459f1aa191 .. 2017-07-21 16:10:39 +02:00
Alexander Zaytsev
8891864f38 .. 2017-07-21 15:40:20 +02:00
Alexander Zaytsev
dfca694114 Merge branch 'master' of https://github.com/transloadit/uppy 2017-07-21 15:40:13 +02:00
Alexander Zaytsev
6b6ad34a96 small design fixes 2017-07-21 15:40:06 +02:00
Renée Kooi
b1af22314a Merge pull request #267 from goto-bus-stop/chore/rename-assembly-event
transloadit: Rename `:assembly` event to `:assembly-created`
2017-07-21 15:35:08 +02:00
Artur Paikin
c0aa769492 update frontend code sample 2017-07-21 15:08:58 +02:00
Artur Paikin
93e5b898fe return this from run, like we do with use 2017-07-21 15:08:58 +02:00
Renée Kooi
9ef22f5529
transloadit: Rename :assembly event to :assembly-created 2017-07-21 13:24:14 +02:00
Alexander Zaytsev
b435962f61 remove shadows from dashboard footer 2017-07-21 12:17:03 +02:00
Alexander Zaytsev
04de1b3e71 Merge branch 'master' of https://github.com/transloadit/uppy 2017-07-21 12:15:33 +02:00
Alexander Zaytsev
e2c49f466c design improvements + session restoring 2017-07-21 12:15:24 +02:00
Renée Kooi
110e2aeab7 Merge pull request #266 from gavboulton/bugfix/license
Update licence in package.json to match LICENSE file (MIT)
2017-07-21 12:10:15 +02:00