13048 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Vjacheslav Trushkin	1be5bd8e13	[feature/merging-style-components] Fixing typo in database updater ... Fixing typo in database_update.php PHPBB3-10632	2012-03-31 18:38:37 +03:00
Igor Wiedler	0ae491c5fa	Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop ... * cyberalien/feature/merging-style-components: (31 commits) [feature/merging-style-components] Fix back link on install page [feature/merging-style-components] Fix for unit tests [feature/merging-style-components] Moving template initialization out of style [feature/merging-style-components] Renaming "delete" to "uninstall" for styles [feature/merging-style-components] Initializing locator and provider separately [feature/merging-style-components] Fixing few errors in acp_styles [feature/merging-style-components] Fix notices in acp_styles [feature/merging-style-components] Updating styles in coding guidelines [feature/merging-style-components] Changing acp_styles text [feature/merging-style-components] Updating test cases [feature/merging-style-components] Updating style initialization [feature/merging-style-components] Changing style class [feature/merging-style-components] Changing template class [feature/merging-style-components] Changing resource locator [feature/merging-style-components] Changing path provider [feature/merging-style-components] Renaming style locator [feature/merging-style-components] Changing $style to $style_id [feature/merging-style-components] Creating style class [feature/merging-style-components] New acp_styles template [feature/merging-style-components] New acp_styles ...	2012-03-31 17:22:54 +02:00
Igor Wiedler	5d07b16ec6	[feature/merging-style-components] Fix back link on install page ... When on install page and all styles are installed, fix back link to go to main styles page. PHPBB3-10632	2012-03-31 18:20:49 +03:00
Vjacheslav Trushkin	377db78dca	[feature/merging-style-components] Fix for unit tests ... Fixing typo in template unit tests PHPBB3-10632	2012-03-31 18:16:53 +03:00
Vjacheslav Trushkin	17989c17a0	[feature/merging-style-components] Moving template initialization out of style ... Moving template initialization out of style constructor PHPBB3-10632	2012-03-31 18:10:00 +03:00
Vjacheslav Trushkin	0540509f14	[feature/merging-style-components] Renaming "delete" to "uninstall" for styles ... Changing from "delete" to "uninstall" in acp_styles to avoid confusing users PHPBB3-10632	2012-03-31 17:58:17 +03:00
Vjacheslav Trushkin	360312f599	[feature/merging-style-components] Initializing locator and provider separately ... Moving locator and path provider initialization out of style class PHPBB3-10632	2012-03-31 17:38:30 +03:00
Vjacheslav Trushkin	9611997552	[feature/merging-style-components] Fixing few errors in acp_styles ... Fixing notices and usability issues PHPBB3-10632	2012-03-31 17:04:17 +03:00
Igor Wiedler	bc46cfd6e5	[feature/merging-style-components] Fix notices in acp_styles ... PHPBB3-10632	2012-03-31 16:53:41 +03:00
Vjacheslav Trushkin	e13e4d9206	[feature/merging-style-components] Updating styles in coding guidelines ... Updating styles section in coding guidelines PHPBB3-10632	2012-03-31 16:33:30 +03:00
Igor Wiedler	e7a4437c1b	Merge pull request #673 from naderman/ticket/10736 ... [ticket/10736] Run composer in phing builds	2012-03-31 06:23:38 -07:00
Nils Adermann	fadeefe770	[ticket/10736] Run composer in phing builds ... PHPBB3-10736	2012-03-31 15:18:49 +02:00
Igor Wiedler	49696789c9	Merge pull request #672 from unknownbliss/ticket/10736 ... [ticket/10736] Changing travis so it installs composer.phar to phpBB/	2012-03-31 04:34:40 -07:00
Michael Cullum	3c21a8e21e	[ticket/10736] Changing travis so it installs composer.phar to phpBB/ ... PHPBB3-10736	2012-03-31 09:38:58 +01:00
Vjacheslav Trushkin	398a6c8045	Merge branch 'develop' into feature/merging-style-components ... * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php	2012-03-31 10:43:06 +03:00
David King	0c8d0a82de	[feature/qrpreview] Add id qr_postform to prosilver QR ... PHPBB3-10726	2012-03-30 21:46:20 -04:00
David King	a7045e6572	[feature/qrpreview] Preview from Quick Reply ... PHPBB3-10726	2012-03-30 21:43:00 -04:00
David King	013a8649a5	Merge remote-tracking branch 'igorw/feature/ajax' into develop	2012-03-30 20:16:00 -04:00
Igor Wiedler	b42e10df28	[feature/ajax] Remove strange non-breaking spaces from approve button ... The viewtopic inline approve/disapprove buttons for posts had spaces. PHPBB3-10270	2012-03-31 02:10:18 +02:00
Igor Wiedler	41d8a777dc	[feature/ajax] Add entirely unrelated but nice newlines ... PHPBB3-10270	2012-03-31 02:10:18 +02:00
Igor Wiedler	4a5172c9f7	[feature/ajax] Unify phpbb_json_response instantiation ... PHPBB3-10270	2012-03-31 02:10:17 +02:00
Igor Wiedler	ef03f8d053	[feature/ajax] Fix acp_styles activate_deactivate ajax callback name ... PHPBB3-10270	2012-03-31 02:10:17 +02:00
Igor Wiedler	8138103c6b	[feature/ajax] Send correct activate/deactivate JSON response in acp_profile ... PHPBB3-10270	2012-03-31 02:10:17 +02:00
Vjacheslav Trushkin	ac320fad05	[ticket/10270] Alter background colors for posts ... Change background colors for posts after deleted post PHPBB3-10270	2012-03-31 02:10:17 +02:00
Igor Wiedler	d3e7744dd6	[feature/ajax] Remove not working module enable/disable ajax code ... PHPBB3-10270	2012-03-31 02:10:17 +02:00
Igor Wiedler	9b971c9fb1	[feature/ajax] Replace static call to phpbb_request with OO ... PHPBB3-10270	2012-03-31 02:10:17 +02:00
Igor Wiedler	07826d6679	[feature/ajax] Remove quick-reply AJAX handling until we have something good ... The current implementation is not very user friendly, lots of things flashing in the user's face. We can re-consider AJAX when we have a decent solution. PHPBB3-10270	2012-03-31 02:10:17 +02:00
Vjacheslav Trushkin	6145e0ba65	[ticket/10270] Changing close button for ajax popups ... Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css PHPBB3-10270	2012-03-31 02:10:16 +02:00
Vjacheslav Trushkin	cf92528390	[ticket/10270] Disabling links in disappearing content ... Disabling click events for blocks that are being removed via ajax PHPBB3-10270	2012-03-31 02:10:16 +02:00
Callum Macrae	10055d58cd	[ticket/10291] Fixed an AJAX bug on quick reply form submit. ... It wasn't fading out. PHPBB3-10291	2012-03-31 02:10:16 +02:00
Callum Macrae	d8e21952fa	[ticket/10273] Fixed accepting / denying posts AJAX. ... PHPBB3-10273	2012-03-31 02:10:16 +02:00
Callum Macrae	64df9d1406	[ticket/10272] Removed code that was prevent event propogation in AJAX. ... PHPBB3-10272	2012-03-31 02:10:16 +02:00
Callum Macrae	ba56e34b6d	[ticket/10291] Fixed a bug in the quick reply AJAX. ... It wasn't submitting, as jQuery was ignoring the submit value. PHPBB3-10291	2012-03-31 02:10:15 +02:00
Igor Wiedler	e73426fe26	[feature/ajax] Handle acp_modules error cases with JSON response ... PHPBB3-10270	2012-03-31 02:10:15 +02:00
Igor Wiedler	2f44850a28	[feature/ajax] Fix filter check, quick mod tools data-attribute ... PHPBB3-10270	2012-03-31 02:10:14 +02:00
Igor Wiedler	ea4362fc4c	[feature/ajax] Use the error handler ... PHPBB3-10270	2012-03-31 02:09:26 +02:00
Igor Wiedler	27199bb509	[feature/ajax] Generic error handling with a phpbb.alert box ... PHPBB3-10270	2012-03-31 02:09:26 +02:00
Igor Wiedler	2f25173d93	[feature/ajax] Change filter semantics, some minor adjustments ... PHPBB3-10270	2012-03-31 02:09:26 +02:00
Igor Wiedler	de82608e6f	[feature/ajax] Refactor phpbb.ajaxify event callback ... PHPBB3-10270	2012-03-31 02:09:26 +02:00
Igor Wiedler	4848d6c9e8	[feature/ajax] Bind to form.submit instead of form input.click ... PHPBB3-10270	2012-03-31 02:09:25 +02:00
Igor Wiedler	b8a6a50f5c	[feature/ajax] Rename exception to filter ... PHPBB3-10270	2012-03-31 02:09:25 +02:00
Igor Wiedler	6ad4015a37	[feature/ajax] Add a missing semicolon ... PHPBB3-10270	2012-03-31 02:09:25 +02:00
Igor Wiedler	fc0d2425dc	[feature/ajax] Fix the alt_text ajax callback ... PHPBB3-10270	2012-03-31 02:09:25 +02:00
Vjacheslav Trushkin	2ede0b1c81	[feature/ajax] Better handling for zebra ... Better handling for zebra: message is displayed instead of first .zebra. Other .zebra entries are emptied, but not completely removed to avoid changing layout. PHPBB3-10272	2012-03-31 02:09:25 +02:00
Igor Wiedler	8a0d8c0a84	[feature/ajax] Do not hard-code sorting images of acp_forums ordering ... PHPBB3-10270	2012-03-31 02:09:25 +02:00
Igor Wiedler	7ed2cbef75	[feature/ajax] Make phpbb.ajaxify signature use single object (more explicit) ... PHPBB3-10270	2012-03-31 02:09:25 +02:00
Igor Wiedler	1fc26eb1d5	[feature/ajax] Make quick-mod tools "exception" handling more explicit ... PHPBB3-10270	2012-03-31 02:09:24 +02:00
Igor Wiedler	d96b07a745	[feature/ajax] Only allow object argument for phpbb.ajaxify ... PHPBB3-10270	2012-03-31 02:09:24 +02:00
Igor Wiedler	a12b7a5c64	[feature/ajax] Fix alt_text and overlay closing ... PHPBB3-10270	2012-03-31 02:09:24 +02:00
Igor Wiedler	d53c36684d	[feature/ajax] JavaScript strict mode ... PHPBB3-10270	2012-03-31 02:09:24 +02:00