Commit graph

265 commits

Author SHA1 Message Date
Resin
98482aacc2 [maven-release-plugin] prepare release album-0.32 2012-01-02 19:22:37 -08:00
e286fef4c1 Merge branch 'master' of ssh://forkalsrud.org/home/gitroot/album 2012-01-02 19:28:38 -08:00
f14d4e06b8 Make sure we flush the cached video if the source file has changed. 2012-01-02 19:28:27 -08:00
bbff5fea41 Merge branch 'master' of ssh://forkalsrud.org/home/gitroot/album 2012-01-02 18:32:36 -08:00
27037a9a6a Deduce the duration if it isn't already present. 2012-01-02 18:32:14 -08:00
Resin
20b968a124 [maven-release-plugin] prepare for next development iteration 2012-01-02 18:26:36 -08:00
Resin
2270daca54 [maven-release-plugin] prepare release album-0.31 2012-01-02 18:26:35 -08:00
Resin
ca17bebd0a [maven-release-plugin] prepare for next development iteration 2012-01-02 16:24:42 -08:00
Resin
8c0888fd7e [maven-release-plugin] prepare release album-0.30 2012-01-02 16:24:40 -08:00
Resin
d56b35dff3 [maven-release-plugin] prepare for next development iteration 2012-01-02 15:59:00 -08:00
Resin
3e03b2ef90 [maven-release-plugin] prepare release album-0.29 2012-01-02 15:58:36 -08:00
1308aead0c Updating Berkeley DB dependency to match what's available from Oracle 2012-01-02 16:03:41 -08:00
1b6325459c [maven-release-plugin] prepare for next development iteration 2012-01-02 15:34:56 -08:00
f412fa6ac0 [maven-release-plugin] prepare release album-0.28 2012-01-02 15:34:50 -08:00
d2473ac2af Let the focusing function run after the pictures have been added to the
grid.
2012-01-02 15:33:51 -08:00
6357d8da59 [maven-release-plugin] prepare for next development iteration 2011-12-31 17:16:35 -08:00
d0c6d8654f [maven-release-plugin] prepare release album-0.27 2011-12-31 17:16:28 -08:00
6124d21a74 fixing up content type for JSON. Going HTML5 2011-12-31 17:13:43 -08:00
e7a4eebf04 [maven-release-plugin] prepare for next development iteration 2011-12-03 15:11:59 -08:00
5c349ab290 [maven-release-plugin] prepare release album-0.26 2011-12-03 15:11:56 -08:00
a85b81e21f Don't forget about the captions. 2011-11-30 01:10:08 -08:00
ecc482528d [maven-release-plugin] prepare for next development iteration 2011-11-19 14:55:33 -08:00
a7228548b7 [maven-release-plugin] prepare release album-0.25 2011-11-19 14:55:30 -08:00
b3a370fc11 make "dynamic.html" the default behavior 2011-11-19 14:42:23 -08:00
46094b5c1e fix FlvFilterTest and swith movie codec from flv to h.264 2011-07-31 21:43:15 -07:00
e039870adc Finally cracked the nut on the FLV metadata processing. 2011-07-31 13:40:27 -07:00
86a09acc4c Cosmetc/compiler warnings 2011-07-31 13:39:33 -07:00
f95a97aa11 Tuning cache controls. In Chrome a reload sets the request header to
max-age=0, but still includes an If-None-Match header.  That means we
sould not depend o a cached ETag, which we don't in any case.  A
shift-reload on the other hand sets the header to no-cache and does not
include an If-None-Match header, meaning this is not a conditional get
at all.
2011-07-11 11:03:46 -07:00
da61095fb3 Even more bugfixing in metadata write. 2011-07-11 00:17:13 -07:00
a58b074873 Debugging more video streaming. Works without regenerating onMetadata. 2011-07-09 18:19:48 -07:00
494c0e5930 More work on movie streaming 2011-07-09 16:57:30 -07:00
a516f02b14 More work on streaming video. 2011-07-06 19:17:52 -07:00
dee96ab87d fix length calculation, remove unnecessary code. 2011-07-04 16:30:47 -07:00
43fef6e92f More FLV metadata logic 2011-07-04 02:09:57 -07:00
df04071177 fix test 2011-07-03 01:23:07 -07:00
984bc2f72c Merge branch 'master' of ssh://aha/home/gitroot/album
Conflicts:
	src/main/java/org/forkalsrud/album/video/MovieCoder.java
2011-07-03 01:18:19 -07:00
a9a5840692 tried to add "duration" metadata to flv stream 2011-07-03 01:16:22 -07:00
aebec22299 The beginning of a filter to patch up the video metadata after the first
run.
2011-07-02 00:58:49 -07:00
74f08f44b0 Some more work on movies. 2011-06-22 15:10:12 -07:00
1b642ddab9 Make sure the "focus" parameter also works for the first image in the album. 2011-03-30 18:38:13 -07:00
22f10bd11b Make sure the "focus" parameter works also for the first image in the album. 2011-03-30 18:37:10 -07:00
12b91ab1ec removed a little duplication 2011-03-28 00:23:29 -07:00
1e04937fab More work on video scaling. dynamic.html now successfully includes movies in the UI. 2011-03-26 21:41:54 -07:00
9b584bd82e More work on the dynamic client side rendering + video display. 2011-03-19 23:58:42 -07:00
2f5876a0e9 First pass at client side rendering based on server provided JSON. 2011-03-19 22:07:27 -07:00
ddb7a87e2c some more work ont the video related code, largely related to running on Mac OSX 2011-03-13 23:41:05 -07:00
e6bad87622 more edit changes with face detection 2011-03-13 23:40:29 -07:00
956f2d3b45 Merge branch 'master' of ssh://forkalsrud.org/home/gitroot/album 2011-03-13 18:00:49 -07:00
fc7f13daad Portotyping of edit screen with face detection. 2011-03-13 18:00:20 -07:00
e13c8f822d created method to read metadata from video files 2011-03-12 17:04:27 -08:00