1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 18:50:25 +02:00

709 Commits

Author SHA1 Message Date
Nils Adermann
f0a4840ccc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
2012-05-11 15:03:25 +02:00
Andreas Fischer
e5afe39987 [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
PHPBB3-10889
2012-05-11 11:22:49 +02:00
Andreas Fischer
553582230e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10887] Add spaces.
  [ticket/10887] Split auto increment test from db tools test.
2012-05-11 11:12:27 +02:00
Oleg Pudeyev
b5b65c214d [ticket/10887] Add spaces.
PHPBB3-10887
2012-05-11 05:06:46 -04:00
Oleg Pudeyev
1019226dfa [ticket/10887] Split auto increment test from db tools test.
Auto increment test does not need any particular columns
and should not depend, in particular, on correct handling
of binary data.

This commit moves auto increment test into its own file and
gives it its own table with a simple schema.

PHPBB3-10887
2012-05-10 23:50:42 -04:00
Oleg Pudeyev
56b2b87423 [ticket/10882] Add a test for including a nonexistent file.
PHPBB3-10882
2012-05-10 03:36:58 -04:00
Oleg Pudeyev
720d07c9b3 [ticket/10882] Add test for an ENDIF without IF.
PHPBB3-10882
2012-05-10 03:28:54 -04:00
Oleg Pudeyev
9a38a034e5 [ticket/10882] Add test for an invalid template tag.
PHPBB3-10882
2012-05-10 03:28:35 -04:00
Andreas Fischer
1a9b30b871 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10858] Move generic row seeking to DBAL
  [ticket/10858] Tests for row seeking with fetchfield()
  [ticket/10858] Fix MSSQL Native's row seeking behavior

Conflicts:
	tests/dbal/select_test.php
2012-05-09 12:55:58 +02:00
Patrick Webster
afbaa6979b [ticket/10858] Tests for row seeking with fetchfield()
PHPBB3-10858
2012-05-08 18:45:51 -05:00
Patrick Webster
1496a4198a [ticket/10678] Add port handling for MSSQL tests
PHPBB3-10678
2012-05-08 04:35:47 -05:00
Patrick Webster
711d09633a [ticket/10678] Move config changes to new location
PHPBB3-10678
2012-05-08 04:34:19 -05:00
Patrick Webster
3cdcd44c4b [ticket/10678] Rename helper class file
PHPBB3-10678
2012-05-08 04:31:32 -05:00
Patrick Webster
ceacb63abf [ticket/10678] Lowercase class name, adjust comment width
PHPBB3-10678
2012-05-08 04:31:32 -05:00
Patrick Webster
9bb2785da0 [ticket/10678] More formatting and docblocks
PHPBB3-10678
2012-05-08 04:31:31 -05:00
Patrick Webster
0a596c4b8c [ticket/10678] More formatting requests
PHPBB3-10678
2012-05-08 04:31:30 -05:00
Patrick Webster
5cbe919256 [ticket/10678] Fix formatting
PHPBB3-10678
2012-05-08 04:31:29 -05:00
Patrick Webster
d578eff712 [ticket/10678] Add better support for Firebird, Oracle, and MSSQL
Allow ODBC connections for Firebird
Capitalize fixture tables and columns for Firebird
On database drop failure, drop all tables
Provide cleanup utilities for databases that cannot be dropped

PHPBB3-10678
2012-05-08 04:31:29 -05:00
David King
5b96b5fce7 [ticket/10837] Removed tearDownAfterClass() from extension_controller_test.php
PHPBB3-10837
2012-05-07 10:39:49 -04:00
Vjacheslav Trushkin
5114edcafe [ticket/10800] Changing html to js for includejs tests
Changing .html to .js files for includejs tests

PHPBB3-10800
2012-05-01 17:41:46 +03:00
Vjacheslav Trushkin
51347ebc09 [ticket/10800] Changing template paths in tests
Changing template paths in tests from absolute to relative

PHPBB3-10800
2012-04-29 00:30:08 +03:00
David King
b82c77b38f [task/functional] Make sure missing language values are handled properly
PHPBB3-10758
2012-04-24 14:10:50 -04:00
David King
8cf0b79a47 [task/functional] Increase code coverage for functional tests
PHPBB3-10758
2012-04-23 17:16:16 -04:00
Patrick Webster
6293bbf099 [ticket/10492] Fix line endings
PHPBB3-10492
2012-04-21 05:24:57 -05:00
Patrick Webster
2aa994b5ad [ticket/10492] Backporting functional tests
PHPBB3-10492
2012-04-21 04:37:57 -05:00
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer
PHPBB3-10492
2012-04-20 23:50:49 -05:00
Vjacheslav Trushkin
d91abbb146 [ticket/10756] Renaming phpbb_style_template to phpbb_template
Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
6cecc91326 [ticket/10756] Removing path provider from template class
Removing path provider from template class because it is not used by template class

PHPBB3-10756
2012-04-19 04:21:56 +02:00
Vjacheslav Trushkin
ef295a2860 [ticket/10756] Renaming template classes
Renaming template classes from phpbb_style_template_ to phpbb_template_

PHPBB3-10756
2012-04-19 04:15:11 +02:00
Nils Adermann
8a1d084d6d [ticket/10783] Correctly add assets_version config var to includejs urls
PHPBB3-10783
2012-04-13 04:08:21 +02:00
Nils Adermann
41e03164c1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10774] Correctly specify index name when creating unique index on MySQL.
  [ticket/10774] Add unit tests for UNIQUE index existence and creation.
2012-04-10 01:14:42 +02:00
Andreas Fischer
41ef41ac63 [ticket/10774] Add unit tests for UNIQUE index existence and creation.
PHPBB3-10774
2012-04-10 00:46:24 +02:00
Igor Wiedler
3ebe89cb7e [feature/dic] Fix test suite for dic-powered cron
PHPBB3-10739
2012-04-09 15:05:28 +02:00
Vjacheslav Trushkin
2d9d8d3673 [ticket/10665] New test class for templates with tree
New parent template test class for tests that use styles tree

PHPBB3-10665
2012-04-01 20:37:45 +03:00
Vjacheslav Trushkin
b548389207 Merge remote-tracking branch 'upstream/develop' into ticket/10665
* upstream/develop:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10731] Fixed addquote() to work on opera browser.
  [ticket/10731] Fixed addquote() to work on opera browser.
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
  [ticket/10675] Add disk full language string when posting attachments
2012-04-01 19:28:37 +03:00
Vjacheslav Trushkin
eaba2ed9ca [ticket/10733] Fixing test
Changing expected and result in locator test

PHPBB3-10733
2012-04-01 19:20:42 +03:00
Vjacheslav Trushkin
f5bac7686b [ticket/10733] Removing static from data providers
Removing static from data provider functions

PHPBB3-10733
2012-04-01 19:14:53 +03:00
Vjacheslav Trushkin
4b2ede433e [ticket/10665] INCLUDEJS unit test
Adding INLCUDEJS test

PHPBB3-10665
2012-04-01 11:17:13 +03:00
Vjacheslav Trushkin
38c988fb59 [ticket/10665] Changing template compiler test
Adding new constructor parameters to template compiler test

PHPBB3-10665
2012-04-01 11:16:57 +03:00
Vjacheslav Trushkin
2509853ca5 [ticket/10733] Adding test for locator
Adding test for $template->locate

PHPBB3-10733
2012-04-01 09:53:23 +03:00
Igor Wiedler
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_*
PHPBB-10609
2012-03-31 18:14:07 +02: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
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
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
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
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
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
David King
caf47f8e19 [ticket/10586] Removed incorrect method call
PHPBB3-10586
2012-03-28 20:21:54 -04:00