MantisBT: master 12ddfaee

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2013-11-04 23:13 master 29b7e599
Changeset

Reintroduce submodule for securimage library

Commit d36a79528391872403b4becb1ec8f21099beeb38 damaged it, and it was
subsequently removed by 8058018a86bbb64efdf62846573c78abbec8ddb5.

This revert went against the team's decision to use submodules, and
furthermore did not take into consideration bug fixes with .htaccess
files, so with this I'm reverting the revert

The web.config file added in d36a79528391872403b4becb1ec8f21099beeb38
was committed in the securimage repository, and the submodule updated to
match the new branch head.

Conflicts:
.gitmodules
library/disposable
mod - .gitmodules Diff File
add - library/securimage Diff File
rm - library/securimage/AHGBold.ttf Diff
rm - library/securimage/LICENSE.txt Diff
rm - library/securimage/README.FONT.txt Diff
rm - library/securimage/README.txt Diff
rm - library/securimage/WavFile.php Diff
rm - library/securimage/audio/en/0.wav Diff
rm - library/securimage/audio/en/1.wav Diff
rm - library/securimage/audio/en/10.wav Diff
rm - library/securimage/audio/en/11.wav Diff
rm - library/securimage/audio/en/12.wav Diff
rm - library/securimage/audio/en/13.wav Diff
rm - library/securimage/audio/en/14.wav Diff
rm - library/securimage/audio/en/15.wav Diff
rm - library/securimage/audio/en/16.wav Diff
rm - library/securimage/audio/en/17.wav Diff
rm - library/securimage/audio/en/18.wav Diff
rm - library/securimage/audio/en/19.wav Diff
rm - library/securimage/audio/en/2.wav Diff
rm - library/securimage/audio/en/20.wav Diff
rm - library/securimage/audio/en/3.wav Diff
rm - library/securimage/audio/en/4.wav Diff
rm - library/securimage/audio/en/5.wav Diff
rm - library/securimage/audio/en/6.wav Diff
rm - library/securimage/audio/en/7.wav Diff
rm - library/securimage/audio/en/8.wav Diff
rm - library/securimage/audio/en/9.wav Diff
rm - library/securimage/audio/en/A.wav Diff
rm - library/securimage/audio/en/B.wav Diff
rm - library/securimage/audio/en/C.wav Diff
rm - library/securimage/audio/en/D.wav Diff
rm - library/securimage/audio/en/E.wav Diff
rm - library/securimage/audio/en/F.wav Diff
rm - library/securimage/audio/en/G.wav Diff
rm - library/securimage/audio/en/H.wav Diff
rm - library/securimage/audio/en/I.wav Diff
rm - library/securimage/audio/en/J.wav Diff
rm - library/securimage/audio/en/K.wav Diff
rm - library/securimage/audio/en/L.wav Diff
rm - library/securimage/audio/en/M.wav Diff
rm - library/securimage/audio/en/MINUS.wav Diff
rm - library/securimage/audio/en/N.wav Diff
rm - library/securimage/audio/en/O.wav Diff
rm - library/securimage/audio/en/P.wav Diff
rm - library/securimage/audio/en/PLUS.wav Diff
rm - library/securimage/audio/en/Q.wav Diff
rm - library/securimage/audio/en/R.wav Diff
rm - library/securimage/audio/en/S.wav Diff
rm - library/securimage/audio/en/T.wav Diff
rm - library/securimage/audio/en/TIMES.wav Diff
rm - library/securimage/audio/en/U.wav Diff
rm - library/securimage/audio/en/V.wav Diff
rm - library/securimage/audio/en/W.wav Diff
rm - library/securimage/audio/en/X.wav Diff
rm - library/securimage/audio/en/Y.wav Diff
rm - library/securimage/audio/en/Z.wav Diff
rm - library/securimage/audio/en/error.wav Diff
rm - library/securimage/audio/noise/check-point-1.wav Diff
rm - library/securimage/audio/noise/crowd-talking-1.wav Diff
rm - library/securimage/audio/noise/crowd-talking-6.wav Diff
rm - library/securimage/audio/noise/crowd-talking-7.wav Diff
rm - library/securimage/audio/noise/kids-playing-1.wav Diff
rm - library/securimage/backgrounds/bg3.jpg Diff
rm - library/securimage/backgrounds/bg4.jpg Diff
rm - library/securimage/backgrounds/bg5.jpg Diff
rm - library/securimage/backgrounds/bg6.png Diff
rm - library/securimage/captcha.html Diff
rm - library/securimage/database/.htaccess Diff
rm - library/securimage/database/index.html Diff
rm - library/securimage/database/securimage.sq3 Diff
rm - library/securimage/example_form.ajax.php Diff
rm - library/securimage/example_form.php Diff
rm - library/securimage/images/audio_icon.png Diff
rm - library/securimage/images/refresh.png Diff
rm - library/securimage/securimage.php Diff
rm - library/securimage/securimage_play.php Diff
rm - library/securimage/securimage_play.swf Diff
rm - library/securimage/securimage_show.php Diff
rm - library/securimage/web.config Diff
rm - library/securimage/words/words.txt Diff