Merge branch 'feature/replace_frontendadmin' of github.com:servee/ser…

…vee into feature/replace_frontendadmin Conflicts: servee/frontendadmin/static/servee/js/frontendadmin.js
pygeek · Mar 23, 2011 · 2b43894 · 2b43894
2 parents 934fbf0 + ef92ef2
commit 2b43894
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 1,671 deletions.
diff --git a/servee/frontendadmin/static/fancybox/blank.gif b/servee/frontendadmin/static/fancybox/blank.gif
diff --git a/servee/frontendadmin/static/fancybox/fancy_close.png b/servee/frontendadmin/static/fancybox/fancy_close.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_loading.png b/servee/frontendadmin/static/fancybox/fancy_loading.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_nav_left.png b/servee/frontendadmin/static/fancybox/fancy_nav_left.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_nav_right.png b/servee/frontendadmin/static/fancybox/fancy_nav_right.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_e.png b/servee/frontendadmin/static/fancybox/fancy_shadow_e.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_n.png b/servee/frontendadmin/static/fancybox/fancy_shadow_n.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_ne.png b/servee/frontendadmin/static/fancybox/fancy_shadow_ne.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_nw.png b/servee/frontendadmin/static/fancybox/fancy_shadow_nw.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_s.png b/servee/frontendadmin/static/fancybox/fancy_shadow_s.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_se.png b/servee/frontendadmin/static/fancybox/fancy_shadow_se.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_sw.png b/servee/frontendadmin/static/fancybox/fancy_shadow_sw.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_shadow_w.png b/servee/frontendadmin/static/fancybox/fancy_shadow_w.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_title_left.png b/servee/frontendadmin/static/fancybox/fancy_title_left.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_title_main.png b/servee/frontendadmin/static/fancybox/fancy_title_main.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_title_over.png b/servee/frontendadmin/static/fancybox/fancy_title_over.png
diff --git a/servee/frontendadmin/static/fancybox/fancy_title_right.png b/servee/frontendadmin/static/fancybox/fancy_title_right.png
diff --git a/servee/frontendadmin/static/fancybox/fancybox-x.png b/servee/frontendadmin/static/fancybox/fancybox-x.png
diff --git a/servee/frontendadmin/static/fancybox/fancybox-y.png b/servee/frontendadmin/static/fancybox/fancybox-y.png
diff --git a/servee/frontendadmin/static/fancybox/fancybox.png b/servee/frontendadmin/static/fancybox/fancybox.png
diff --git a/servee/frontendadmin/static/fancybox/jquery.easing-1.3.pack.js b/servee/frontendadmin/static/fancybox/jquery.easing-1.3.pack.js