Changeset [ff009e7ebcb7a2f7ba47d696410cab5c3df1d564] by Ceeram

Revision ff009e7ebcb7a2f7ba47d696410cab5c3df1d564, committed by Ceeram · January 6th, 2010 @ 01:55 AM

Merge branch 'dev' of git://github.com/infinitas/infinitas into dev
http://github.com/infinitas/infinitas/commit/ff009e7ebcb7a2f7ba47d6...

260 changed files

A infinitas/blog/views/elements/admin/actions.ctp
A infinitas/blog/views/elements/admin/right_boxes.ctp
A infinitas/cms/views/elements/admin/actions.ctp
A infinitas/management/views/elements/admin/actions.ctp
A infinitas/newsletter/views/elements/admin/actions.ctp
A views/elements/admin/actions.ctp
A views/elements/admin/right_boxes.ctp
R infinitas/blog/views/elements/actions.ctp
R infinitas/blog/views/elements/right_boxes.ctp
R infinitas/cms/views/elements/actions.ctp
R infinitas/cms/views/elements/right_boxes.ctp
R infinitas/forum/README
R infinitas/forum/config/core.php
R infinitas/forum/config/defaults.ini
R infinitas/forum/config/schema/schema.sql
R infinitas/forum/config/schema/users_alter.sql
R infinitas/forum/config/schema/users_create.sql
R infinitas/forum/controllers/categories_controller.php
R infinitas/forum/controllers/components/auto_login.php
R infinitas/forum/controllers/components/toolbar.php
R infinitas/forum/controllers/home_controller.php
R infinitas/forum/controllers/posts_controller.php
R infinitas/forum/controllers/reports_controller.php
R infinitas/forum/controllers/search_controller.php
R infinitas/forum/controllers/staff_controller.php
R infinitas/forum/controllers/topics_controller.php
R infinitas/forum/controllers/users_controller.php
R infinitas/forum/forum_app_controller.php
R infinitas/forum/forum_app_model.php
R infinitas/forum/locale/deu/LC_MESSAGES/forum.po
R infinitas/forum/locale/eng/LC_MESSAGES/forum.po
R infinitas/forum/locale/forum.pot
R infinitas/forum/locale/fre/LC_MESSAGES/forum.po
R infinitas/forum/locale/ind/LC_MESSAGES/forum.po
R infinitas/forum/locale/rus/LC_MESSAGES/forum.po
R infinitas/forum/locale/spa/LC_MESSAGES/forum.po
R infinitas/forum/models/access.php
R infinitas/forum/models/access_level.php
R infinitas/forum/models/forum.php
R infinitas/forum/models/forum_category.php
R infinitas/forum/models/moderator.php
R infinitas/forum/models/poll.php
R infinitas/forum/models/poll_option.php
R infinitas/forum/models/poll_vote.php
R infinitas/forum/models/post.php
R infinitas/forum/models/report.php
R infinitas/forum/models/setting.php
R infinitas/forum/models/topic.php
R infinitas/forum/models/user.php
R infinitas/forum/vendors/css/style.css
R infinitas/forum/vendors/geshi/geshi.php
R infinitas/forum/vendors/geshi/geshi/abap.php
R infinitas/forum/vendors/geshi/geshi/actionscript.php
R infinitas/forum/vendors/geshi/geshi/actionscript3.php
R infinitas/forum/vendors/geshi/geshi/ada.php
R infinitas/forum/vendors/geshi/geshi/apache.php
R infinitas/forum/vendors/geshi/geshi/applescript.php
R infinitas/forum/vendors/geshi/geshi/apt_sources.php
R infinitas/forum/vendors/geshi/geshi/asm.php
R infinitas/forum/vendors/geshi/geshi/asp.php
R infinitas/forum/vendors/geshi/geshi/autoit.php
R infinitas/forum/vendors/geshi/geshi/avisynth.php
R infinitas/forum/vendors/geshi/geshi/bash.php
R infinitas/forum/vendors/geshi/geshi/basic4gl.php
R infinitas/forum/vendors/geshi/geshi/bf.php
R infinitas/forum/vendors/geshi/geshi/bibtex.php
R infinitas/forum/vendors/geshi/geshi/blitzbasic.php
R infinitas/forum/vendors/geshi/geshi/bnf.php
R infinitas/forum/vendors/geshi/geshi/boo.php
R infinitas/forum/vendors/geshi/geshi/c.php
R infinitas/forum/vendors/geshi/geshi/c_mac.php
R infinitas/forum/vendors/geshi/geshi/caddcl.php
R infinitas/forum/vendors/geshi/geshi/cadlisp.php
R infinitas/forum/vendors/geshi/geshi/cfdg.php
R infinitas/forum/vendors/geshi/geshi/cfm.php
R infinitas/forum/vendors/geshi/geshi/cil.php
R infinitas/forum/vendors/geshi/geshi/cmake.php
R infinitas/forum/vendors/geshi/geshi/cobol.php
R infinitas/forum/vendors/geshi/geshi/cpp-qt.php
R infinitas/forum/vendors/geshi/geshi/cpp.php
R infinitas/forum/vendors/geshi/geshi/csharp.php
R infinitas/forum/vendors/geshi/geshi/css.php
R infinitas/forum/vendors/geshi/geshi/d.php
R infinitas/forum/vendors/geshi/geshi/dcs.php
R infinitas/forum/vendors/geshi/geshi/delphi.php
R infinitas/forum/vendors/geshi/geshi/diff.php
R infinitas/forum/vendors/geshi/geshi/div.php
R infinitas/forum/vendors/geshi/geshi/dos.php
R infinitas/forum/vendors/geshi/geshi/dot.php
R infinitas/forum/vendors/geshi/geshi/eiffel.php
R infinitas/forum/vendors/geshi/geshi/email.php
R infinitas/forum/vendors/geshi/geshi/erlang.php
R infinitas/forum/vendors/geshi/geshi/fo.php
R infinitas/forum/vendors/geshi/geshi/fortran.php
R infinitas/forum/vendors/geshi/geshi/freebasic.php
R infinitas/forum/vendors/geshi/geshi/genero.php
R infinitas/forum/vendors/geshi/geshi/gettext.php
R infinitas/forum/vendors/geshi/geshi/glsl.php
R infinitas/forum/vendors/geshi/geshi/gml.php
R infinitas/forum/vendors/geshi/geshi/gnuplot.php
R infinitas/forum/vendors/geshi/geshi/groovy.php
R infinitas/forum/vendors/geshi/geshi/haskell.php
R infinitas/forum/vendors/geshi/geshi/hq9plus.php
R infinitas/forum/vendors/geshi/geshi/html4strict.php
R infinitas/forum/vendors/geshi/geshi/idl.php
R infinitas/forum/vendors/geshi/geshi/ini.php
R infinitas/forum/vendors/geshi/geshi/inno.php
R infinitas/forum/vendors/geshi/geshi/intercal.php
R infinitas/forum/vendors/geshi/geshi/io.php
R infinitas/forum/vendors/geshi/geshi/java.php
R infinitas/forum/vendors/geshi/geshi/java5.php
R infinitas/forum/vendors/geshi/geshi/javascript.php
R infinitas/forum/vendors/geshi/geshi/kixtart.php
R infinitas/forum/vendors/geshi/geshi/klonec.php
R infinitas/forum/vendors/geshi/geshi/klonecpp.php
R infinitas/forum/vendors/geshi/geshi/latex.php
R infinitas/forum/vendors/geshi/geshi/lisp.php
R infinitas/forum/vendors/geshi/geshi/locobasic.php
R infinitas/forum/vendors/geshi/geshi/lolcode.php
R infinitas/forum/vendors/geshi/geshi/lotusformulas.php
R infinitas/forum/vendors/geshi/geshi/lotusscript.php
R infinitas/forum/vendors/geshi/geshi/lscript.php
R infinitas/forum/vendors/geshi/geshi/lsl2.php
R infinitas/forum/vendors/geshi/geshi/lua.php
R infinitas/forum/vendors/geshi/geshi/m68k.php
R infinitas/forum/vendors/geshi/geshi/make.php
R infinitas/forum/vendors/geshi/geshi/matlab.php
R infinitas/forum/vendors/geshi/geshi/mirc.php
R infinitas/forum/vendors/geshi/geshi/modula3.php
R infinitas/forum/vendors/geshi/geshi/mpasm.php
R infinitas/forum/vendors/geshi/geshi/mxml.php
R infinitas/forum/vendors/geshi/geshi/mysql.php
R infinitas/forum/vendors/geshi/geshi/nsis.php
R infinitas/forum/vendors/geshi/geshi/oberon2.php
R infinitas/forum/vendors/geshi/geshi/objc.php
R infinitas/forum/vendors/geshi/geshi/ocaml-brief.php
R infinitas/forum/vendors/geshi/geshi/ocaml.php
R infinitas/forum/vendors/geshi/geshi/oobas.php
R infinitas/forum/vendors/geshi/geshi/oracle11.php
R infinitas/forum/vendors/geshi/geshi/oracle8.php
R infinitas/forum/vendors/geshi/geshi/pascal.php
R infinitas/forum/vendors/geshi/geshi/per.php
R infinitas/forum/vendors/geshi/geshi/perl.php
R infinitas/forum/vendors/geshi/geshi/php-brief.php
R infinitas/forum/vendors/geshi/geshi/php.php
R infinitas/forum/vendors/geshi/geshi/pic16.php
R infinitas/forum/vendors/geshi/geshi/pixelbender.php
R infinitas/forum/vendors/geshi/geshi/plsql.php
R infinitas/forum/vendors/geshi/geshi/povray.php
R infinitas/forum/vendors/geshi/geshi/powershell.php
R infinitas/forum/vendors/geshi/geshi/progress.php
R infinitas/forum/vendors/geshi/geshi/prolog.php
R infinitas/forum/vendors/geshi/geshi/properties.php
R infinitas/forum/vendors/geshi/geshi/providex.php
R infinitas/forum/vendors/geshi/geshi/python.php
R infinitas/forum/vendors/geshi/geshi/qbasic.php
R infinitas/forum/vendors/geshi/geshi/rails.php
R infinitas/forum/vendors/geshi/geshi/rebol.php
R infinitas/forum/vendors/geshi/geshi/reg.php
R infinitas/forum/vendors/geshi/geshi/robots.php
R infinitas/forum/vendors/geshi/geshi/ruby.php
R infinitas/forum/vendors/geshi/geshi/sas.php
R infinitas/forum/vendors/geshi/geshi/scala.php
R infinitas/forum/vendors/geshi/geshi/scheme.php
R infinitas/forum/vendors/geshi/geshi/scilab.php
R infinitas/forum/vendors/geshi/geshi/sdlbasic.php
R infinitas/forum/vendors/geshi/geshi/smalltalk.php
R infinitas/forum/vendors/geshi/geshi/smarty.php
R infinitas/forum/vendors/geshi/geshi/sql.php
R infinitas/forum/vendors/geshi/geshi/tcl.php
R infinitas/forum/vendors/geshi/geshi/teraterm.php
R infinitas/forum/vendors/geshi/geshi/text.php
R infinitas/forum/vendors/geshi/geshi/thinbasic.php
R infinitas/forum/vendors/geshi/geshi/tsql.php
R infinitas/forum/vendors/geshi/geshi/typoscript.php
R infinitas/forum/vendors/geshi/geshi/vb.php
R infinitas/forum/vendors/geshi/geshi/vbnet.php
R infinitas/forum/vendors/geshi/geshi/verilog.php
R infinitas/forum/vendors/geshi/geshi/vhdl.php
R infinitas/forum/vendors/geshi/geshi/vim.php
R infinitas/forum/vendors/geshi/geshi/visualfoxpro.php
R infinitas/forum/vendors/geshi/geshi/visualprolog.php
R infinitas/forum/vendors/geshi/geshi/whitespace.php
R infinitas/forum/vendors/geshi/geshi/whois.php
R infinitas/forum/vendors/geshi/geshi/xml.php
R infinitas/forum/vendors/geshi/geshi/xorg_conf.php
R infinitas/forum/vendors/geshi/geshi/xpp.php
R infinitas/forum/vendors/geshi/geshi/z80.php
R infinitas/forum/vendors/img/forum_closed.png
R infinitas/forum/vendors/img/forum_new.png
R infinitas/forum/vendors/img/forum_open.png
R infinitas/forum/vendors/img/goto.png
R infinitas/forum/vendors/img/poll.png
R infinitas/forum/vendors/img/topic_announcement.png
R infinitas/forum/vendors/img/topic_closed.png
R infinitas/forum/vendors/img/topic_important.png
R infinitas/forum/vendors/img/topic_new.png
R infinitas/forum/vendors/img/topic_new_hot.png
R infinitas/forum/vendors/img/topic_open.png
R infinitas/forum/vendors/img/topic_open_hot.png
R infinitas/forum/vendors/img/topic_sticky.png
R infinitas/forum/vendors/js/script.js
R infinitas/forum/views/categories/admin_delete_category.ctp
R infinitas/forum/views/categories/admin_delete_forum.ctp
R infinitas/forum/views/categories/admin_form_category.ctp
R infinitas/forum/views/categories/admin_form_forum.ctp
R infinitas/forum/views/categories/admin_index.ctp
R infinitas/forum/views/categories/moderate.ctp
R infinitas/forum/views/categories/rss/feed.ctp
R infinitas/forum/views/categories/view.ctp
R infinitas/forum/views/elements/copyright.ctp
R infinitas/forum/views/elements/login.ctp
R infinitas/forum/views/elements/navigation.ctp
R infinitas/forum/views/elements/pagination.ctp
R infinitas/forum/views/helpers/cupcake.php
R infinitas/forum/views/helpers/decoda.php
R infinitas/forum/views/home/admin_index.ctp
R infinitas/forum/views/home/admin_settings.ctp
R infinitas/forum/views/home/help.ctp
R infinitas/forum/views/home/index.ctp
R infinitas/forum/views/home/rss/feed.ctp
R infinitas/forum/views/home/rules.ctp
R infinitas/forum/views/layouts/admin.ctp
R infinitas/forum/views/layouts/default.ctp
R infinitas/forum/views/layouts/rss/default.ctp
R infinitas/forum/views/posts/add.ctp
R infinitas/forum/views/posts/edit.ctp
R infinitas/forum/views/posts/report.ctp
R infinitas/forum/views/reports/admin_index.ctp
R infinitas/forum/views/reports/admin_posts.ctp
R infinitas/forum/views/reports/admin_topics.ctp
R infinitas/forum/views/reports/admin_users.ctp
R infinitas/forum/views/search/index.ctp
R infinitas/forum/views/staff/admin_delete_access_level.ctp
R infinitas/forum/views/staff/admin_form_access.ctp
R infinitas/forum/views/staff/admin_form_access_level.ctp
R infinitas/forum/views/staff/admin_form_moderator.ctp
R infinitas/forum/views/staff/admin_index.ctp
R infinitas/forum/views/topics/add.ctp
R infinitas/forum/views/topics/edit.ctp
R infinitas/forum/views/topics/moderate.ctp
R infinitas/forum/views/topics/report.ctp
R infinitas/forum/views/topics/rss/feed.ctp
R infinitas/forum/views/topics/view.ctp
R infinitas/forum/views/users/admin_delete.ctp
R infinitas/forum/views/users/admin_edit.ctp
R infinitas/forum/views/users/admin_index.ctp
R infinitas/forum/views/users/edit.ctp
R infinitas/forum/views/users/forgot.ctp
R infinitas/forum/views/users/listing.ctp
R infinitas/forum/views/users/login.ctp
R infinitas/forum/views/users/profile.ctp
R infinitas/forum/views/users/report.ctp
R infinitas/forum/views/users/signup.ctp
R infinitas/management/views/elements/actions.ctp
R infinitas/management/views/elements/right_boxes.ctp
R infinitas/newsletter/views/elements/actions.ctp
R infinitas/newsletter/views/elements/right_boxes.ctp
M app_controller.php
M views/layouts/admin.ctp