GitHub PushEvent at 2014-07-28 14:49:38
Repository: Osclass
Actor: conejoninja
Payload: {"shas":[["8c063959d12102cdc7fb9a777e46b9352c91d8bc","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","CRLF will be replaced by LF","Juan Ramón",false],["679f19a064808d46c14c199bf4c36531e9b5993d","7887d68a6924d5869f71ebb811bc4b6164606a6a@gmail.com","Fix incorrect detection of string as php-format by xgettext.\n\nBecause of \"100%\" in the string, xgettext thinks this is a format string. This is wrong, so add the appropriate tag to correct the heuristics.","Václav Slavík",false],["bb50655502f6147666bb4b7bcc2ec36f0831e95f","89438a6ecae304b3110e4835edffbab31db57a05@osclass.org","Merge pull request #779 from vslavik/patch-1\n\nFix incorrect detection of string as php-format by xgettext.","_CONEJO",false],["73571b568c56442c3130de273d072160ee51bb49","51390396e3fe636190fee7c6a203e8b904c86e01@theninjabunny.com","Version 3.2.0\n\nConflicts:\n\toc-includes/osclass/assets/js/tiny_mce/plugins/ajaxfilemanager/inc/config.base.php","conejoninja",false],["9fb6b2502fbc89c427f7694464d638c6b2f4cc1c","51390396e3fe636190fee7c6a203e8b904c86e01@theninjabunny.com","Merge branch 'master' of github.com:osclass/Osclass","conejoninja",false],["69f83cdf93437c75e439b681ad599a66fd3834f0","2bd8b9b483478a4e4b01cd0e1be80f8e7e894133@gmail.com","Hide \"Login\" and \"Register\" links when users are disabled in User Settings\n\nHide \"Login\" and \"Register\" links when users are disabled in User Settings instead of flash message showing \"Users not enabled\".","extr",false],["29d8f79569a7e6351af1d8cc20615b7738ae6f67","89438a6ecae304b3110e4835edffbab31db57a05@osclass.org","Merge pull request #931 from extr/patch-2\n\nHide \"Login\" and \"Register\" links when users are disabled in User Settin...","Daniel Esteban",false],["d20f40b8f640b1589f083f39d7ccb0846e4baeea","4b0b4e45087c0b760803641f5cd4eeb1e8bee69d@gmail.com","Update functions.php\n\nEnd Tag for <img .. /> added.","hyperion4ever",false],["fdf92055dd566ed9bb2f7286978041b6db0c40c8","89438a6ecae304b3110e4835edffbab31db57a05@osclass.org","Merge pull request #970 from hyperion4ever/patch-2\n\nUpdate functions.php\r\n\r\nThanks for the help","Daniel Esteban",false],["19d14fec4aff74a9aacbe258928fcea546656f68","e09da8c07233524030f0f8c91c9d7cb4f56e44a3@gmail.com","Update reported.php","gilden-",false],["20dcd16bd925fd7280a7dc195ea4fd7ace1ab17f","89438a6ecae304b3110e4835edffbab31db57a05@osclass.org","Merge pull request #980 from gilden-/patch-1\n\nThanks!","Daniel Esteban",false],["7cad5c4af553d27bae38e7cb673f5f470d9eb3a5","51390396e3fe636190fee7c6a203e8b904c86e01@theninjabunny.com","Revert \"Merge pull request #980 from gilden-/patch-1\"\n\nThis reverts commit 20dcd16bd925fd7280a7dc195ea4fd7ace1ab17f, reversing\nchanges made to fdf92055dd566ed9bb2f7286978041b6db0c40c8.","conejoninja",false],["487dcd15df73927f4feb7dd169e9bd47a8fa0990","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","Version 3.2.2","Juan Ramón",false],["e79d731ccfdab9821538dc71916202ccbfb617e1","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","Version 3.2.2\n\n* hotfixes: (123 commits)\n  Version 3.2.2\n  small fix\n  missing pagination on bender theme, issue #899 and pull-request #1085\n  added support for mb_strlen in case mbstring extension is not installed\n  missed attr on Item->metaFields()\n  added comments\n  fixed #1091, allowed GET params on 'seo' urls, minor improvements\n  the previous function was removing some 0 (zero) values, this fix that\n  issue #1090 params in search_url are cleaned before making the url\n  some helpers were missing\n  fix on search_url\n  put it back\n  small improvement too\n  small fix on multiple categories selcets showing ALL the categories instead of only the enabled ones\n  \"list_*\" and \"search_*\", two different name with same purpose\n  Do we need to call doSearch again?\n  some fixes , issue #1080 the problem is not fixed, but we stopped using the functions since they're not really needed\n  added some more code\n  added suport for attachment in contact form\n  fixed #1036, added missed validations\n  ...","Juan Ramón",false],["58adb3fa5074585a007da8243594140f19b8fe24","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","Version 3.2.2\n\n* hotfixes:\n  Version 3.2.2\n  copied bender into gui\n  small fix\n\nConflicts:\n\toc-includes/osclass/installer/readme.php","Juan Ramón",false],["f6efbc9dbdcd69387334ac32c753bafbe186edec","4dc4bbfa36069f95686fa4cbb2e1e140c4253263@rediffmail.com","Update user-items.php\n\nPre-closure of div tag. it should be in line #72 instead of #51 (out of the else condition)\r\nthis will affect the footer(footer is wrapped, should be outside the wrapper)","ameenullah",false],["4674f98b4eb57ff1097f4e39d60a7c58236da7e7","89438a6ecae304b3110e4835edffbab31db57a05@osclass.org","Merge pull request #1168 from ameenullah/patch-1\n\nUpdate user-items.php","Daniel Esteban",false],["dfd8fc73ed9541703a702dbc8839522795f25ebf","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","Merge branch 'develop'\n\n* develop: (160 commits)\n  issue #1239\n  show error on ajax uploader, fix some CSS\n  fix place holder / label of expiration days in the amdin panel add listing\n  release notes updated to 3.3.0 stable\n  some filters added\n  issue #1239\n  added placeholder file\n  issue #1222\n  issue #1240\n  issue / pull reuqest #1236\n  forgot to move Arial.ttf to new location\n  issue #1237\n  Can read category/\n  Arial.ttf moved to /fonts subfolder\n  updated bender\n  small fix on canonical region urls without category\n  issue #1224\n  issue #1223\n  issue #1220\n  updated po files, also updated gui folder with bender theme\n  ...\n\nConflicts:\n\toc-content/themes/bender\n\toc-content/themes/bender/functions.php\n\toc-content/themes/bender/header.php\n\toc-content/themes/bender/user-items.php\n\toc-includes/osclass/installer/readme.php","Juan Ramón",false],["ec5bc27bba752c788056adba0b554f9a0b93fe77","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","Remove submodule bender","Juan Ramón",false],["522d13cd2782d12e9afb6df100603235239576be","ffd383c248005037b55838e7a7e1d160dba4197e@gmail.com","Remove bender from .gitignore","Juan Ramón",false]],"size":470,"ref":"refs/heads/hotfixes","head":"cbd896ffcb43ea9ac2df4936ff9295548bea8b90"}