Commit graph

282 commits

Author SHA1 Message Date
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
6b0082c685 Merge branch 'master' of ssh://aha/home/gitroot/album 2011-02-05 22:13:34 -08:00
6e0368d4d5 new versions of a couple of third-party libs 2011-02-05 22:12:59 -08:00
45fc47f099 [maven-release-plugin] prepare for next development iteration 2010-11-02 17:19:25 -07:00
b40cded047 [maven-release-plugin] prepare release album-0.24 2010-11-02 17:19:23 -07:00
4df8e0ba4b adding convenience data dumper 2010-11-02 17:18:25 -07:00
05c291c9d8 removing noop delay 2010-11-01 23:30:36 -07:00
17c59ef407 Adding optional ?focus=filename to focus a specific image 2010-11-01 23:28:45 -07:00
2bf3b9a229 [maven-release-plugin] prepare for next development iteration 2010-10-23 16:41:35 -07:00
72b2f9e92a [maven-release-plugin] prepare release album-0.23 2010-10-23 16:41:33 -07:00
1ce75d2da8 Adding search box, make searches case insensitive 2010-10-23 16:36:13 -07:00
7eeb7d9bae Initial work on keyword search 2010-10-23 14:01:21 -07:00
5149259970 Make sure cache is invalidated whenever we do an edit. 2010-08-21 21:39:58 -07:00
ad19ca5200 Adding hidden URL (*.edit) to edit captions through web interface. 2010-08-21 21:06:24 -07:00
99afd6d29f [maven-release-plugin] prepare for next development iteration 2010-08-20 23:43:25 -07:00
be106c6992 [maven-release-plugin] prepare release album-0.22 2010-08-20 23:43:23 -07:00
be7ad56dc1 Take care of HTML escaping of Velocity references. 2010-08-18 22:01:37 -07:00
0fe2667b30 Make use of the caption element to provide the "title" for the fancybox. Better that duplicating the data, and it also allows for HTML elements within the caption. 2010-08-18 21:48:00 -07:00
b19fae9f12 Less radical easing curve 2010-07-31 17:00:42 -07:00
f3f1f90e57 [maven-release-plugin] prepare for next development iteration 2010-07-31 16:34:46 -07:00
55a5e080bc [maven-release-plugin] prepare release album-0.21 2010-07-31 16:34:45 -07:00
88883126b3 Quick/dirty fix for IE 2010-07-31 16:33:37 -07:00
a62d53a98f Use fancybox/jquery for a more web2.0 experience. 2010-07-31 15:24:45 -07:00
jzulli
e926c4bc2e Blah 2010-07-29 13:42:05 -07:00
c2608de4bb [maven-release-plugin] prepare for next development iteration 2010-07-18 15:41:14 -07:00
61da0b6817 [maven-release-plugin] prepare release album-0.20 2010-07-18 15:41:11 -07:00
d6e2f6c947 Adding box shadow around the photo. 2010-07-17 16:54:51 -07:00
b0b7e7c625 Merge branch 'master' of ssh://forkalsrud.org/home/gitroot/album 2010-07-05 12:41:41 -07:00
aae802f8e7 [maven-release-plugin] prepare for next development iteration 2010-07-03 17:46:36 -07:00
307eda46ea [maven-release-plugin] prepare release album-0.19 2010-07-03 17:46:35 -07:00
0e4398a7df revert 382409c438 2010-07-03 17:45:55 -07:00
0d12759128 update scm url (album -> album.git) 2010-07-03 17:43:35 -07:00
382409c438 [maven-release-plugin] prepare release album-0.19 2010-07-03 17:19:13 -07:00
11c4af6dbb standardize logging to slf4j -> log4j 2010-07-03 17:17:43 -07:00