Commit graph

13626 commits

Author SHA1 Message Date
Callum Macrae
83095c2a2d [ticket/10270] Lengthened the timeout on the AJAX request error.
It was at 3 seconds before, now it is at 5 seconds from when the popup
has faded in.

PHPBB3-10270
2012-03-31 02:09:13 +02:00
Callum Macrae
dce38f44de [ticket/10328] Added a JSON class.
The JSON class adds a consistent way to send JSON to the client, making
it perfect for AJAX (jQuery automatically parses it).

PHPBB3-10328
2012-03-31 02:09:13 +02:00
Callum Macrae
94172b54dd [ticket/10271] Changed AJAX functions to $request->is_ajax().
PHPBB3-10271
2012-03-31 02:09:13 +02:00
Callum Macrae
69eb7b8332 [ticket/10270] Added keyboard shortcuts to confirm and alert boxes.
PHPBB3-10270
2012-03-31 02:09:13 +02:00
Callum Macrae
59031fdc73 [ticket/10272] AJAXified the add / remove friend / foe links.
PHPBB3-10272
2012-03-31 02:09:12 +02:00
Callum Macrae
bb7a03f738 [ticket/10281] AJAXified reordering forums in the ACP.
PHPBB3-10281
2012-03-31 02:09:12 +02:00
Callum Macrae
22c6953c11 [feature/ajax] Fixed a small bug in the JavaScript.
The bug meant that code outside of the function that ran on document ready would
not be able to access the phpbb object.

PHPBB3-10270
2012-03-31 02:09:12 +02:00
Callum Macrae
e4ea4d1c57 [ticket/10270] Fixed a bug where fadedark wouldn't go.
If the confirm box was submitted as yes, then the fadedark would stay until it
was clicked. This commit fixes that.

PHPBB3-10270
2012-03-31 02:09:12 +02:00
Callum Macrae
149daa0e4f [feature/ajax] Added code to avoid conflicts with other libraries using $
PHPBB3-10270
2012-03-31 02:09:12 +02:00
Callum Macrae
7ccc18297a [ticket/10270] Makes page fade to dark on popup, and added $.querystring.
PHPBB3-10270
2012-03-31 02:09:12 +02:00
Callum Macrae
b9bbbc3ede [ticket/10291] AJAXified quick reply form.
Also changed the show quick reply button to a button, not a submit - it was
affecting the behaviour of phpbb.ajaxify.

PHPBB3-10291
2012-03-31 02:09:12 +02:00
Callum Macrae
57fa45b0c4 [ticket/10271] AJAXified Quick-mod tools.
Also made some improvements to the exceptions.

PHPBB3-10271
2012-03-31 02:09:11 +02:00
Callum Macrae
efe872745f [feature/ajax] Replaced jQuery selectors with data attributes.
Due to problems that could have been caused by selecting the element using
jQuery selectors, they have been replaced by HTML5 data attributes.

PHPBB3-10270
2012-03-31 02:09:11 +02:00
Callum Macrae
ac8743902d [ticket/10270] Removed the js anim functions.
This commit removes the hide_anim, show_anim and remove_anim functions and
replaces them with built in jQuery function that do exactly the same thing.

PHPBB3-10270
2012-03-31 02:09:11 +02:00
Callum Macrae
8fd86717e1 [ticket/10271] Added ability for exceptions to phpbb.ajaxify.
Also made it easy for additional options to be added in the future.

PHPBB3-10271
2012-03-31 02:09:09 +02:00
Callum Macrae
2f2ec1096b [ticket/10272] Made some jQuery selectors more specific to avoid conflicts.
Before, a link to any URL with, say, "mode=bump" in the title would have been
prevented from acting normally.

PHPBB3-10272
2012-03-31 02:00:23 +02:00
Callum Macrae
ac1b32c307 [ticket/10270] Changed function names of jQuery modifications.
The code was modifying the jQuery code before, now the functions have been
renamed to unused function names.

PHPBB3-10270
2012-03-31 02:00:23 +02:00
Callum Macrae
fbad17f912 [feature/ajax] Reduced duplicate code by merging all AJAX function into one.
This commit merges phpbb.confirm_box, phpbb.ajaxify and phpbb.ajaxify_form into
one function which automatically detects what is happening and calls the
correct code accordingly. This has removed a lot of duplicate code and
generally made the code cleaner.

PHPBB3-10270
2012-03-31 02:00:23 +02:00
Callum Macrae
f42f6f1902 [ticket/10273] Added phpbb.ajaxify_form and converted accept / deny to it.
Also made a few minor improvements to other JavaScript.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
Callum Macrae
456e561442 [ticket/10270] Cleaned up code and made popups fade.
This commit cleans up some code - mostly, replacing all instances of __self
with "that", and also replacing the parse_hidden function with jQuerys built
in .serialize. It also adds animations to the popups.

PHPBB3-10270
2012-03-31 02:00:22 +02:00
Callum Macrae
8a28456f75 [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).
This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
Callum Macrae
c4aaf3ae5a [feature/ajax] Cleaned up AJAX-related JavaScript.
Mostly just added comments, but has cleaned up some actual code too.

PHPBB3-10270
2012-03-31 02:00:22 +02:00
Callum Macrae
2556f5fcc2 [ticket/10272] AJAXified most links.
This commit makes some significant changes to the phpbb.confirm_box function
(namely, removing some duplicate code), and also manually adds most link
to the phpBB AJAX functions.

PHPBB3-10272
2012-03-31 02:00:22 +02:00
Callum Macrae
e6401c081e [ticket/10271] Added phpbb.confirm_box (JavaScript).
As well as adding the method, this commit also changes the previous commit
so that deleting a post from viewtopic uses this method, too. This commit
has also made some improvements to phpbb.alert and phpbb.confirm.

PHPBB3-10271
2012-03-31 02:00:22 +02:00
Callum Macrae
d420ceb9c7 [ticket/10270] Added JavaScript popups and basic AJAX functionality to PHP.
This commit adds the phpbb object (JavaScript), and alert and confirm box
methods. It also adds the first basic AJAX functionality, to deleting posts
in viewtopic.

PHPBB3-10270
2012-03-31 02:00:22 +02:00
David King
4f97cc1295 Merge remote-tracking branch 'cyberalien/feature/purge-cache' into develop 2012-03-30 19:34:08 -04:00
David King
0f93e0c719 Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/duplicate-colors' into develop 2012-03-30 18:57:14 -04:00
David King
dc07617c19 Merge branch 'callumacrae/ticket/10510-' into develop 2012-03-30 18:28:18 -04:00
Vjacheslav Trushkin
f15167bcfa Merge remote-tracking branch 'imkingdavid/ticket/10727' into develop
* imkingdavid/ticket/10727:
  [ticket/10727] Do not hide Quick Reply with javascript on prosilver
2012-03-31 00:22:04 +03:00
David King
3d610e3872 Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/remove-tweaks2' into develop 2012-03-30 17:08:40 -04:00
Igor Wiedler
313cf7297c Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympus
Feature/events dispatcher olympus
2012-03-30 11:15:54 -07:00
Michael Cullum
9391d423c0 [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
To keep the .gitignore's the same.

PHPBB3-9550
2012-03-30 19:13:32 +01:00
Igor Wiedler
0bd635f1b4 Merge pull request #662 from imkingdavid/ticket/10586
[ticket/10586] Use an abstract class that implements the interface
2012-03-30 10:59:46 -07:00
David King
c9b4f12110 Merge branch 'develop-olympus' into develop 2012-03-30 13:39:31 -04:00
David King
dc4d0677b9 Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-olympus 2012-03-30 13:38:40 -04:00
David King
d60d9aa9d5 Merge remote-tracking branch 'igorw/feature/event-dispatcher' into develop 2012-03-30 13:25:56 -04:00
Vjacheslav Trushkin
506951e8af [feature/merging-style-components] Changing acp_styles text
Changing acp styles welcome message a little bit.

PHPBB3-10632
2012-03-30 16:13:16 +03:00
Igor Wiedler
951e2c8d0c [feature/event-dispatcher] Fix copyright years
PHPBB3-9550
2012-03-30 14:22:20 +02:00
Igor Wiedler
d4f1bdea3b Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher
* upstream/develop: (35 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
  [ticket/10703] Added a condition to check if ext directory exists
  [ticket/10708] Check converted passwords for multi-byte characters
  [ticket/10586] Tests finally work (thanks naderman)
  [ticket/10586] Correctly purge board cache and don't rename install directory
  [ticket/10586] trying to get tests to work
  [ticket/10586] more work on getting tests to pass
  [ticket/10586] Tests are coming along, just a little more to go
  [ticket/10586] Rename install directory back to install/ after tests
  [ticket/10586] browse tests now work, but mine dont. at least we are making progress
  [ticket/10586] initial work on copying fixtures. Note that this depends on 10706
  [ticket/10586] Adding the extensions used by the tests
  [ticket/10586] Now tests run, but fail. But here is what I have.
  ...
2012-03-30 14:05:40 +02:00
Michael Cullum
cab437ae83 [feature/event-dispatcher] Add dependencies install information
PHPBB3-9550
2012-03-30 14:04:46 +02:00
Michael Cullum
0d6a5cb6ae [feature/event-dispatcher] Update core.page_header event
Update it to the new correct format.

PHPBB3-9550
2012-03-30 14:04:20 +02:00
David King
29a904ce45 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/language/en/acp/common.php
2012-03-29 20:43:03 -04:00
David King
10d4f8c35e Merge branch 'harderthanfire/ticket/10129' into develop-olympus 2012-03-29 20:37:50 -04:00
Michael Cullum
b250ffc561 [feature/event-dispatcher] Add .gitignore to ignore the composer.phar file
PHPBB3-9550
2012-03-29 23:19:35 +01:00
Callum Macrae
ddf1a05ad0 [ticket/10510] Added docs to viewtopic quick mod tools array.
PHPBB3-10510
2012-03-29 21:09:02 +01:00
Vjacheslav Trushkin
ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components
* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  ...

Conflicts:
	phpBB/install/database_update.php
2012-03-29 22:38:07 +03:00
Igor Wiedler
7aef3eb7b3 [feature/event-dispatcher] Braces CS fix
PHPBB3-9550
2012-03-29 21:31:44 +02:00
Bruno Ais
56629d8e3c [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
Located the L_WARNINGS_ZERO_TOTAL in subsilver2 and replaced it with
L_NO_WARNINGS

PHPBB3-10705
2012-03-29 15:52:28 +01:00
Bruno Ais
d0e7b38aec [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
Located the L_WARNINGS_ZERO_TOTAL in prosilver and replaced it with
L_NO_WARNINGS

PHPBB3-10705
2012-03-29 15:52:06 +01:00
Bruno Ais
28fac32742 [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
Located the WARNINGS_ZERO_TOTAL in the language and replaced it with
NO_WARNINGS

PHPBB3-10705
2012-03-29 15:51:06 +01:00