0000000000000000000000000000000000000000 54248d94953aed57ca1f5806955ded9825ea3465 Matt Fawcett <fawcett@viddler.com> 1390916163 +0000	clone: from git@github.com:viddler/WP-Plugin.git
54248d94953aed57ca1f5806955ded9825ea3465 54248d94953aed57ca1f5806955ded9825ea3465 Matt Fawcett <fawcett@viddler.com> 1390916239 +0000	checkout: moving from master to jan-2014-updates
54248d94953aed57ca1f5806955ded9825ea3465 3edd632fb48aebe18dfc34ed8623a823cdc4a538 Matt Fawcett <fawcett@viddler.com> 1390916259 +0000	commit: Get rid of trunk folder
3edd632fb48aebe18dfc34ed8623a823cdc4a538 be475e55dd8d789f6696df70676d14ea0e3bd82b Matt Fawcett <fawcett@viddler.com> 1390916357 +0000	checkout: moving from jan-2014-updates to wip
be475e55dd8d789f6696df70676d14ea0e3bd82b 54248d94953aed57ca1f5806955ded9825ea3465 Matt Fawcett <fawcett@viddler.com> 1390916369 +0000	checkout: moving from wip to 54248d94953aed57ca1f5806955ded9825ea3465^0
54248d94953aed57ca1f5806955ded9825ea3465 08d2582a68dd25083ba2cba24ea18b0f9dbb1a6a Matt Fawcett <fawcett@viddler.com> 1390916369 +0000	rebase: Initial import
08d2582a68dd25083ba2cba24ea18b0f9dbb1a6a dea4839ff3407077cc778e523e96937173e3b1d3 Matt Fawcett <fawcett@viddler.com> 1390916369 +0000	rebase: Fix broken php tags in viddler-shortcode.php which causes strange output
dea4839ff3407077cc778e523e96937173e3b1d3 87af5b7dfe8b50348f6861ae86ac390c86a90f8e Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Use explicit <?php tag so you do not need the option enabled that allows
87af5b7dfe8b50348f6861ae86ac390c86a90f8e 81832dfcd0627958d0521d4eb2612138087b6913 Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Add a custom css file and use it to add a width declarion on the table
81832dfcd0627958d0521d4eb2612138087b6913 a134ab9e269195d6b7c57cb2b30b6eb8127301c2 Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Remove viddler_allow_login option that doesn't appear to be actually
a134ab9e269195d6b7c57cb2b30b6eb8127301c2 686f0b8f06fe43c5f5ef11adcad8ef8421b39a7c Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Strip out abilility to login/logout/register when recording a video
686f0b8f06fe43c5f5ef11adcad8ef8421b39a7c 4a00491b5d7eb6ed0bee424521758aec0e10275b Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Ensure error is displayed if there is a problem getting the record token
4a00491b5d7eb6ed0bee424521758aec0e10275b 924baf0bd782880d12e2290f988958085d6b38fa Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Do not hide a div that does not exist
924baf0bd782880d12e2290f988958085d6b38fa 67f520213c6ae9a54bad52fcf655fa3632f03b7c Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Replace facebox directory with latest version from Github. The old
67f520213c6ae9a54bad52fcf655fa3632f03b7c 114213ef5862831148907642a708f4404dfd0972 Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: DDon ont rely on $_GET['session_id'] to update the video details, just
114213ef5862831148907642a708f4404dfd0972 c0ae9cb7ace2dcaf8f5d9a6cd546e0eeabc169c5 Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Use credentials from the dbSimplify the user credentials. The record comments widget will now work
c0ae9cb7ace2dcaf8f5d9a6cd546e0eeabc169c5 d8acb36da7f69684e83760041481196497bf38ec Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Add a script that pulls credentials from the old config file into the db
d8acb36da7f69684e83760041481196497bf38ec 0f6c3061ea349fe3e19d7ab8f9a4eecd4fb85d80 Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Better messaging
0f6c3061ea349fe3e19d7ab8f9a4eecd4fb85d80 3afc4d9a5b6a1114468a2248c6d4ac844274ec20 Matt Fawcett <fawcett@viddler.com> 1390916370 +0000	rebase: Use correct password arrtibute
3afc4d9a5b6a1114468a2248c6d4ac844274ec20 94590219954985e07c0f0db5e0823156fe050d77 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Change the admin record function so that it does not require login
94590219954985e07c0f0db5e0823156fe050d77 392f477e0aca80d224127d52fbd5bf0283ee0335 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Prevent PHP warnings if the config file does not exist
392f477e0aca80d224127d52fbd5bf0283ee0335 0fb690da3ddd7f5ec6cd36001be05ad73b639cd7 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Fix showing your videos when no password is specified. Privacy level was
0fb690da3ddd7f5ec6cd36001be05ad73b639cd7 19fd4795dc50a9c918844319af6f0585db754dc2 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Force users to specify their username in the settings
19fd4795dc50a9c918844319af6f0585db754dc2 5eb3c9599f1a137c4af53d16112f5efce4cbc972 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Remove help text that is no longer applicable
5eb3c9599f1a137c4af53d16112f5efce4cbc972 fce7cea770c80ba10dc7102487431c38267ba81f Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Copu accross plupload and viddler_uploader js library
fce7cea770c80ba10dc7102487431c38267ba81f 1536d9724a6b147d14847d5477e7f935a74e9b58 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Add the upload template
1536d9724a6b147d14847d5477e7f935a74e9b58 60ebe89705c07c2b5c7475bfba72b1ac12732723 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Started the empty upload tab
60ebe89705c07c2b5c7475bfba72b1ac12732723 dfd2169ca7db3811be517bc741ebdb197bd669a9 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Upgrade plupload, it seems we were missing the swf for some reason
dfd2169ca7db3811be517bc741ebdb197bd669a9 417c558dbb0303c2c02dbe59bc81e855c424ed94 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Display initial upload button on page
417c558dbb0303c2c02dbe59bc81e855c424ed94 a7f6a3907b305cd0e84a7816f30d45e1097b2bf1 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Display javascript tag on upload page
a7f6a3907b305cd0e84a7816f30d45e1097b2bf1 9d60468da5f50b76ff0f2a6c6923d479f2573be2 Matt Fawcett <fawcett@viddler.com> 1390916371 +0000	rebase: Compile coffee
9d60468da5f50b76ff0f2a6c6923d479f2573be2 8d325ef8c9f156a4b37be503c798820bd7ccb310 Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Remove package dependency
8d325ef8c9f156a4b37be503c798820bd7ccb310 8f28ef375c9f85d00c2672bcfbaa8aa1645ef3d6 Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Fix close tag issue
8f28ef375c9f85d00c2672bcfbaa8aa1645ef3d6 8797b535cfdcd7e5f628d33d5c2bc5b09a5ddf2e Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Make jQuery exposed as $
8797b535cfdcd7e5f628d33d5c2bc5b09a5ddf2e 17eadc99d682d22cf01382eda7df4dad6599c896 Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Hard code the runtime
17eadc99d682d22cf01382eda7df4dad6599c896 6a9e5deffd37ef6c13db6d36fb8dfff5799f7c65 Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Proper javascript dependency handling
6a9e5deffd37ef6c13db6d36fb8dfff5799f7c65 748868ce26f3af10457c186714d7d9031bb6534d Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Now retrieving token and endpoint
748868ce26f3af10457c186714d7d9031bb6534d cb895c6c734c1d0abdb6fb81ff071573ca190f16 Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Copy across the container divs
cb895c6c734c1d0abdb6fb81ff071573ca190f16 3a36a7eb4eb2733d19c610a24b34c6c3a1e779fc Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Upgrade to latest plupload. Old version showed flash overlay but did not
3a36a7eb4eb2733d19c610a24b34c6c3a1e779fc d49fe0a10f7812e7d6a7784042775ecf2694920d Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: I now have the flash widget opening the overlay, was due to document not
d49fe0a10f7812e7d6a7784042775ecf2694920d 67e7097a03d74a66a5f8b6b45838b8669ef50301 Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Get the upload token and endpoint before initializing plupload
67e7097a03d74a66a5f8b6b45838b8669ef50301 e8b32d95a7518f0a74a2768d21ef439e926233fa Matt Fawcett <fawcett@viddler.com> 1390916372 +0000	rebase: Add the truncate function to the library
e8b32d95a7518f0a74a2768d21ef439e926233fa c29eb880018f913c9c1af152d061d67057abde40 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Remove debugging message
c29eb880018f913c9c1af152d061d67057abde40 d9f82201af17b2ab5f9204ece8fc0628240e05bb Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Intial copy over of css for uploader
d9f82201af17b2ab5f9204ece8fc0628240e05bb d020c304d2e8def620c9e1b5c778eea33f9c6e85 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Starting to make progress on having the upload details displaying ok
d020c304d2e8def620c9e1b5c778eea33f9c6e85 463599581f9836999ffae59dd39748b6bbfc2052 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Uploaded video bar now looking reasonable
463599581f9836999ffae59dd39748b6bbfc2052 edc997a8717f34891f00b522ffc1f9d568e8d16f Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Force uploader to use json endpoint rather than php
edc997a8717f34891f00b522ffc1f9d568e8d16f 800c2096316fd9b41cfa1e2db13f445c11e02610 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Quick and dirty link to add the video to the post
800c2096316fd9b41cfa1e2db13f445c11e02610 3436beaa1d1626e5a8bccf3ea6da256cf6525ae0 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Ensure correct text positioning
3436beaa1d1626e5a8bccf3ea6da256cf6525ae0 08aebe1f0c3d836e4b43de0c5c3f240a6def4ff7 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Remove console.log
08aebe1f0c3d836e4b43de0c5c3f240a6def4ff7 150dfcb18511b1883b5d1a9fa0630948abc6f838 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Add polling to get status of an encoding video
150dfcb18511b1883b5d1a9fa0630948abc6f838 5a2da70f0f72e5425c6ce3517066a8c80c7f5edc Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: After upload is complete, use the actual width and height of the video
5a2da70f0f72e5425c6ce3517066a8c80c7f5edc 177dd3280a621d2bbb54a602202accfdf081c093 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Add space between button and upload item
177dd3280a621d2bbb54a602202accfdf081c093 fa1f296f0c788a370ea8df83f1e3841e70adbfb2 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase: Remove need for Array#avg so the estimated time now works
fa1f296f0c788a370ea8df83f1e3841e70adbfb2 fa1f296f0c788a370ea8df83f1e3841e70adbfb2 Matt Fawcett <fawcett@viddler.com> 1390916373 +0000	rebase finished: returning to refs/heads/wip
fa1f296f0c788a370ea8df83f1e3841e70adbfb2 3edd632fb48aebe18dfc34ed8623a823cdc4a538 Matt Fawcett <fawcett@viddler.com> 1390916385 +0000	checkout: moving from wip to jan-2014-updates
3edd632fb48aebe18dfc34ed8623a823cdc4a538 54248d94953aed57ca1f5806955ded9825ea3465 Matt Fawcett <fawcett@viddler.com> 1390916592 +0000	checkout: moving from jan-2014-updates to master
54248d94953aed57ca1f5806955ded9825ea3465 be475e55dd8d789f6696df70676d14ea0e3bd82b Matt Fawcett <fawcett@viddler.com> 1390916626 +0000	checkout: moving from master to jan-2014-updates
be475e55dd8d789f6696df70676d14ea0e3bd82b 54248d94953aed57ca1f5806955ded9825ea3465 Matt Fawcett <fawcett@viddler.com> 1390916697 +0000	checkout: moving from jan-2014-updates to master
54248d94953aed57ca1f5806955ded9825ea3465 54248d94953aed57ca1f5806955ded9825ea3465 Matt Fawcett <fawcett@viddler.com> 1390916722 +0000	checkout: moving from master to jan-2014-updates
54248d94953aed57ca1f5806955ded9825ea3465 06c6b8c3291c339f06e3e783b7692aa91305bf1c Matt Fawcett <fawcett@viddler.com> 1390916750 +0000	commit: Move content out of trunk folder
06c6b8c3291c339f06e3e783b7692aa91305bf1c f2089ec01ff578ce954ed63235d2d28e6ec05dd4 Matt Fawcett <fawcett@viddler.com> 1390916872 +0000	commit: Apply updates that were missing from the repo but are in version 1.5.2
f2089ec01ff578ce954ed63235d2d28e6ec05dd4 be475e55dd8d789f6696df70676d14ea0e3bd82b Matt Fawcett <fawcett@viddler.com> 1390916929 +0000	checkout: moving from jan-2014-updates to wip
be475e55dd8d789f6696df70676d14ea0e3bd82b f2089ec01ff578ce954ed63235d2d28e6ec05dd4 Matt Fawcett <fawcett@viddler.com> 1390916940 +0000	checkout: moving from wip to f2089ec01ff578ce954ed63235d2d28e6ec05dd4^0
f2089ec01ff578ce954ed63235d2d28e6ec05dd4 d585e2c9128882b8628266561f36b098e9b7b339 Matt Fawcett <fawcett@viddler.com> 1390917074 +0000	rebase: Fix broken php tags in viddler-shortcode.php which causes strange output
d585e2c9128882b8628266561f36b098e9b7b339 3e6f5e98b6518b295fe4a0e3fa89da9f623a36d3 Matt Fawcett <fawcett@viddler.com> 1390917074 +0000	rebase: Use explicit <?php tag so you do not need the option enabled that allows
3e6f5e98b6518b295fe4a0e3fa89da9f623a36d3 d2ecf7a54e6abe93a344baebba074bfe0fea2e96 Matt Fawcett <fawcett@viddler.com> 1390917074 +0000	rebase: Add a custom css file and use it to add a width declarion on the table
d2ecf7a54e6abe93a344baebba074bfe0fea2e96 be0f7c55a872abc5e2ce6ccffe3eb9b542cbb3a5 Matt Fawcett <fawcett@viddler.com> 1390917074 +0000	rebase: Remove viddler_allow_login option that doesn't appear to be actually
be0f7c55a872abc5e2ce6ccffe3eb9b542cbb3a5 17f281b0ece6de4dc02b31c2c8066c707bbbc6b2 Matt Fawcett <fawcett@viddler.com> 1390917074 +0000	rebase: Strip out abilility to login/logout/register when recording a video
17f281b0ece6de4dc02b31c2c8066c707bbbc6b2 56e15493abe1861fe60dd9d5e864fa7e768e1e86 Matt Fawcett <fawcett@viddler.com> 1390917074 +0000	rebase: Ensure error is displayed if there is a problem getting the record token
56e15493abe1861fe60dd9d5e864fa7e768e1e86 b3d9cee522762064bdff86e7e28473461abe7fac Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Do not hide a div that does not exist
b3d9cee522762064bdff86e7e28473461abe7fac 9e7aa38821546e313208653e542bf1d5b99f6ce7 Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Replace facebox directory with latest version from Github. The old
9e7aa38821546e313208653e542bf1d5b99f6ce7 68644a6d82dcf18114c5cf429517fb5bb1b71b45 Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: DDon ont rely on $_GET['session_id'] to update the video details, just
68644a6d82dcf18114c5cf429517fb5bb1b71b45 5423c039e88804681042521419ebf00041b148b7 Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Use credentials from the dbSimplify the user credentials. The record comments widget will now work
5423c039e88804681042521419ebf00041b148b7 871b2bd9466a9230c808b6015444daea84ac5587 Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Add a script that pulls credentials from the old config file into the db
871b2bd9466a9230c808b6015444daea84ac5587 10cb8700450eb7513f7467af326e407d928465d3 Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Better messaging
10cb8700450eb7513f7467af326e407d928465d3 e0767b2121de7f34f9989a021b2e2c5c9685e1cd Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Use correct password arrtibute
e0767b2121de7f34f9989a021b2e2c5c9685e1cd 8aeb29479435a1ddff54da63159d25f8e5a6936f Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Change the admin record function so that it does not require login
8aeb29479435a1ddff54da63159d25f8e5a6936f 52ae5ad5b576b5c84ee9ffb57ed2c12311c6a2df Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Prevent PHP warnings if the config file does not exist
52ae5ad5b576b5c84ee9ffb57ed2c12311c6a2df 374a9c0afb3ba9717a429b85901ef24cf8104e20 Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Fix showing your videos when no password is specified. Privacy level was
374a9c0afb3ba9717a429b85901ef24cf8104e20 f62e5571915144407db174c97b090f8bff31cc3e Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Force users to specify their username in the settings
f62e5571915144407db174c97b090f8bff31cc3e bb6c4464767505ded2128b8eac32fef9ec369bbb Matt Fawcett <fawcett@viddler.com> 1390917075 +0000	rebase: Remove help text that is no longer applicable
bb6c4464767505ded2128b8eac32fef9ec369bbb 6d9c11baa2a18add3a6b3629a35c0f99c86ad7c2 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Copu accross plupload and viddler_uploader js library
6d9c11baa2a18add3a6b3629a35c0f99c86ad7c2 4e66755a8ed57a4b92ade62ac06740af830f89bc Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Add the upload template
4e66755a8ed57a4b92ade62ac06740af830f89bc a045deb1edeb8ec5eb72fc57dba4b13f9b2b6bc6 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Started the empty upload tab
a045deb1edeb8ec5eb72fc57dba4b13f9b2b6bc6 e1af05cd0271451cfbcee6873a798047a9a5a98e Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Upgrade plupload, it seems we were missing the swf for some reason
e1af05cd0271451cfbcee6873a798047a9a5a98e d04c1efbe0f5314627fac30f9f933c0e9e4a9df3 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Display initial upload button on page
d04c1efbe0f5314627fac30f9f933c0e9e4a9df3 339eea42b805fd7a67c30ee54cb495c639d01340 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Display javascript tag on upload page
339eea42b805fd7a67c30ee54cb495c639d01340 07981ea17f4b85d60f7f6e38fa10dfe4952fafcf Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Compile coffee
07981ea17f4b85d60f7f6e38fa10dfe4952fafcf f0b584ccd9f8e3fa58071c0ead6715839cc1547e Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Remove package dependency
f0b584ccd9f8e3fa58071c0ead6715839cc1547e cceeb76444031eeca6a551f823190cc70b64a7d7 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Fix close tag issue
cceeb76444031eeca6a551f823190cc70b64a7d7 e1489a33c505761ca422346232f502ef5e25e5c6 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Make jQuery exposed as $
e1489a33c505761ca422346232f502ef5e25e5c6 2a63fce83d5c4d956a0039deeb08247d83d35e80 Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Hard code the runtime
2a63fce83d5c4d956a0039deeb08247d83d35e80 e4deccbb7cbac978af0b50b2f9a5175bd75c676f Matt Fawcett <fawcett@viddler.com> 1390917076 +0000	rebase: Proper javascript dependency handling
e4deccbb7cbac978af0b50b2f9a5175bd75c676f c52776a831cc5950e54629ef711d0f67fa59a35e Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Now retrieving token and endpoint
c52776a831cc5950e54629ef711d0f67fa59a35e 896504fd4776fcdc471e6342c8ec6ce739ad8956 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Copy across the container divs
896504fd4776fcdc471e6342c8ec6ce739ad8956 4a8316ea954586e63ef2fed0b2b6c5cfdaa0ce09 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Upgrade to latest plupload. Old version showed flash overlay but did not
4a8316ea954586e63ef2fed0b2b6c5cfdaa0ce09 59241066283748d0441e8721e85ef4268e638348 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: I now have the flash widget opening the overlay, was due to document not
59241066283748d0441e8721e85ef4268e638348 b7920c019a933888a5bd2b806f4bca14e0859fb4 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Get the upload token and endpoint before initializing plupload
b7920c019a933888a5bd2b806f4bca14e0859fb4 f375fdf94320cf788bfaff73128b81b6f978d16c Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Add the truncate function to the library
f375fdf94320cf788bfaff73128b81b6f978d16c f6576bd2a709511d02e354c6a4e83f7e0143e458 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Remove debugging message
f6576bd2a709511d02e354c6a4e83f7e0143e458 2e423653988d005ac34c413ed91019404ada4a04 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Intial copy over of css for uploader
2e423653988d005ac34c413ed91019404ada4a04 5f7eb0f5177212806c77d8260211a307e42fb284 Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Starting to make progress on having the upload details displaying ok
5f7eb0f5177212806c77d8260211a307e42fb284 38c9f486dc6ec668fca5d4027c5dbf3ae84ede1d Matt Fawcett <fawcett@viddler.com> 1390917077 +0000	rebase: Uploaded video bar now looking reasonable
38c9f486dc6ec668fca5d4027c5dbf3ae84ede1d 47553fe548ea7a7b4509b6b87a064885e4ffc55a Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Force uploader to use json endpoint rather than php
47553fe548ea7a7b4509b6b87a064885e4ffc55a 6b55f1b8d49aada9964b91480d9ab603eca4e38c Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Quick and dirty link to add the video to the post
6b55f1b8d49aada9964b91480d9ab603eca4e38c 04eef8d1c5cb972438b34b50b738fa984f8bdfbb Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Ensure correct text positioning
04eef8d1c5cb972438b34b50b738fa984f8bdfbb df6979d6396153723101b5ea9a9ee7621bc2296d Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Remove console.log
df6979d6396153723101b5ea9a9ee7621bc2296d 1e08f390116b0d2244bd797ec1048e4899adbe7c Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Add polling to get status of an encoding video
1e08f390116b0d2244bd797ec1048e4899adbe7c c1c4e2946be4b2ad24531ac063b5f58452d5dc53 Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: After upload is complete, use the actual width and height of the video
c1c4e2946be4b2ad24531ac063b5f58452d5dc53 2aaea9d5f19b3ec405ca5ab55c1d656c382ed363 Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Add space between button and upload item
2aaea9d5f19b3ec405ca5ab55c1d656c382ed363 2671b1dfe9fcf2306f65c423b3a14b4ff8d55f73 Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase: Remove need for Array#avg so the estimated time now works
2671b1dfe9fcf2306f65c423b3a14b4ff8d55f73 2671b1dfe9fcf2306f65c423b3a14b4ff8d55f73 Matt Fawcett <fawcett@viddler.com> 1390917078 +0000	rebase finished: returning to refs/heads/wip
2671b1dfe9fcf2306f65c423b3a14b4ff8d55f73 f2089ec01ff578ce954ed63235d2d28e6ec05dd4 Matt Fawcett <fawcett@viddler.com> 1390917100 +0000	checkout: moving from wip to jan-2014-updates
f2089ec01ff578ce954ed63235d2d28e6ec05dd4 2671b1dfe9fcf2306f65c423b3a14b4ff8d55f73 Matt Fawcett <fawcett@viddler.com> 1390917103 +0000	merge wip: Fast-forward
2671b1dfe9fcf2306f65c423b3a14b4ff8d55f73 d2f5542396595c7be30cdf3558021c5ffd6ce16c Matt Fawcett <fawcett@viddler.com> 1390930199 +0000	commit: Bump version
d2f5542396595c7be30cdf3558021c5ffd6ce16c 0765f55820d951b942111057aa62eea50d47fe1a Matt Fawcett <fawcett@viddler.com> 1390930279 +0000	commit (amend): Bump version
0765f55820d951b942111057aa62eea50d47fe1a 2c3df2bc7d0836dbee456fc2238a4bccbcac9ad3 Matt Fawcett <fawcett@viddler.com> 1391007511 +0000	commit: Remove calls to empty() that pass a function as the the parameter. This
2c3df2bc7d0836dbee456fc2238a4bccbcac9ad3 b3a83a2e4c2e57efc676567bb9261afe426673ef Matt Fawcett <fawcett@viddler.com> 1391007886 +0000	commit (amend): Remove calls to empty() that pass a function as the the parameter. This
b3a83a2e4c2e57efc676567bb9261afe426673ef 4f8f6ef4a9012ad3476e0c107588c2a87cc33184 Matt Fawcett <fawcett@viddler.com> 1391007946 +0000	pull origin jan-2014-updates: Merge made by the 'recursive' strategy.
4f8f6ef4a9012ad3476e0c107588c2a87cc33184 1b7bc2a59fe50aa641cda41c91250d1d13cbabb3 Matt Fawcett <fawcett@viddler.com> 1392118174 +0000	commit: Increase width of comment recorder so that controls do not get cut off
1b7bc2a59fe50aa641cda41c91250d1d13cbabb3 d6f9d5bd4b2c215f30a098b30bb141c9e9489593 Matt Fawcett <fawcett@viddler.com> 1392118199 +0000	commit: Fix css syntax
d6f9d5bd4b2c215f30a098b30bb141c9e9489593 eaf2f288daa79554840846a08168313595528ad5 Matt Fawcett <fawcett@viddler.com> 1392120065 +0000	commit: Do not show the next link on the yourvideos listing page if there are
eaf2f288daa79554840846a08168313595528ad5 fb91c822f86399efa74c5e4f77fd21383317bf2a Matt Fawcett <fawcett@viddler.com> 1392132518 +0000	commit: Do not make videos public after doing a record
fb91c822f86399efa74c5e4f77fd21383317bf2a 0ebbf8328f821c1ee36c1c267b3f7cb618efd8ce Matt Fawcett <fawcett@viddler.com> 1392199735 +0000	commit: Update changelog
