LimeSurvey: master af48780b

Diff Back to Repository
Author Committer Branch Timestamp Parent
apmuthu apmuthu master 2013-12-21 02:39 master 2edc03f1
Changeset

Merge pull request #4 from LimeSurvey/master

Merge with Upstream
mod - .gitignore Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_d1f098_40x100.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_e2f6be_40x100.png Diff
rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_f3fce2_40x100.png Diff
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fafafa_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fefefe_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_50_aaaaaa_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_e7f8c8_40x100.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_fafafa_40x100.png Diff
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_95_fef1ec_40x100.png Diff File
add - styles/gringegreen/jquery-ui/images/ui-bg_highlight-soft_75_daf5a7_1x100.png Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
add - tmp/runtime/cache/index.html Diff File