1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

16837 Commits

Author SHA1 Message Date
Dhruv
22998ee5ee [ticket/9341] Follow the Next/Prev link in tests
follow the next/prev link and then assert if the page contains
its last post or not

PHPBB3-9341
2013-06-28 00:52:36 +05:30
Dhruv
69001902b9 [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
PHPBB3-9341
2013-06-27 20:47:03 +05:30
Dhruv
bd9ece7ab6 [ticket/9341] Add tests for checking Next and Previous template vars
PHPBB3-9341
2013-06-27 00:59:37 +05:30
Dhruv
1f989c6be7 [ticket/9341] Move create_topic and post into functional test case
create_topic and create_post are moved into functional test case
so that they can be used by other tests as well

PHPBB3-9341
2013-06-27 00:57:34 +05:30
Dhruv
fdd60548bf [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
PHPBB3-9341
2013-06-22 03:44:22 +05:30
sakimahesh
465b515600 [ticket/9341] Correctly named template vars
PHPBB3-9341
2013-06-22 03:44:17 +05:30
Dhruv
d72b5aaf1b Merge remote-tracking branch 'nickvergessen/ticket/11561' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11561:
  [ticket/11561] Specify used tables in notification fixture, so they are emptied
2013-06-18 21:42:07 +05:30
Joas Schilling
b8678f4678 [ticket/11561] Specify used tables in notification fixture, so they are emptied
PHPBB3-11561
2013-06-18 10:41:52 +02:00
Joas Schilling
80747a0530 Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-06-13 21:19:02 +02:00
Joas Schilling
7edd70d6df Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820-develop' into develop
* remotes/dhruvgoel92/ticket/10820-develop: (34 commits)
  [ticket/10820] fix if condition to check for IE
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8
  [ticket/10820] Fix function docblock
  [ticket/10820] Add test cases More test cases to check against different versions
  [ticket/10820] Rename function
  [ticket/10820] Fix copyright
  [ticket/10820] Change function call in tests
  ...
2013-06-13 21:18:52 +02:00
Joas Schilling
e19ed7d8b9 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820' into develop-olympus
* remotes/dhruvgoel92/ticket/10820:
  [ticket/10820] fix if condition to check for IE
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8
2013-06-13 21:06:37 +02:00
Dhruv
4e8f1bf894 Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
  [ticket/10820] fix if condition to check for IE

Conflicts:
	phpBB/download/file.php
2013-06-14 00:32:23 +05:30
Dhruv
de150cb4ad [ticket/10820] fix if condition to check for IE
PHPBB3-10820
2013-06-14 00:29:06 +05:30
Dhruv
86583754c3 Merge branch 'ticket/10820' into ticket/10820-develop
# By Dhruv (13) and riadhchtara (1)
* ticket/10820:
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8

Conflicts:
	phpBB/download/file.php
2013-06-13 22:12:39 +05:30
Dhruv
773bcc1c9b Merge branch 'develop' into ticket/10820-develop
# By Marc Alexander (10) and Joas Schilling (2)
# Via Andreas Fischer (3) and Joas Schilling (1)
* develop:
  [ticket/11605] Remove unused copied_files property
  [ticket/11605] Use empty_dir to better delete files and dirs of extensions
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-13 22:05:01 +05:30
Dhruv
e8b535bf9b Merge branch 'develop' into ticket/10820-develop
# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
  [ticket/11599] Copy the forums into a static array for later reuse
  [ticket/11602] Do not call localize_errors() if avatars are disabled
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/11590] Close database connections when tearDown() is called
  [ticket/develop/11543] Use plurals in develop
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
  [ticket/11481] Move prepended slash from calls into function
  ...
2013-06-13 22:00:12 +05:30
Dhruv
48f764437f [ticket/10820] Add additional check for IE in condition
PHPBB3-10820
2013-06-13 21:47:37 +05:30
Dhruv
e0b9cdf708 [ticket/10820] Fix function docblock
PHPBB3-10820
2013-06-12 20:22:48 +05:30
Dhruv
11cd9f901e [ticket/10820] Inject IE version in function
PHPBB3-10820
2013-06-12 20:22:47 +05:30
Dhruv
6b5780b753 [ticket/10820] fix regex
Extract IE version from user agent string and then compare it with 7

PHPBB3-10820
2013-06-12 20:22:46 +05:30
Dhruv
8f733cc658 [ticket/10820] remove unnecessary parentheses
PHPBB3-10820
2013-06-12 20:22:45 +05:30
Dhruv
5ebebbd719 [ticket/10820] fix docblock
PHPBB3-10820
2013-06-12 20:22:44 +05:30
Dhruv
ea7ece5d25 [ticket/10820] add param and return to function
Add param and return in function docblock. Rename function
parameter to $user_agent.

PHPBB3-10820
2013-06-12 20:22:43 +05:30
Dhruv
687b04bcfc [ticket/10820] simplify regex and escape dot
PHPBB3-10820
2013-06-12 20:22:42 +05:30
Dhruv
364828de24 [ticket/10820] Use singular return
PHPBB3-10820
2013-06-12 20:22:40 +05:30
Dhruv
07c62dd64f [ticket/10820] remove unnecessary condition checks
PHPBB3-10820
2013-06-12 20:22:39 +05:30
Dhruv
8759147674 [ticket/10820] add function docblock
PHPBB3-10820
2013-06-12 20:22:38 +05:30
Dhruv
9236f12577 [ticket/10820] fix IE check function
Add phpbb_ prefix to function name and return boolean value.

PHPBB3-10820
2013-06-12 20:22:37 +05:30
Dhruv
80d164b121 [ticket/10820] proper usage of global and local variable browser
PHPBB3-10820
2013-06-12 20:22:36 +05:30
riadhchtara
fbebc2874f [ticket/10820] Image downloader recognize new version of ie
When a user download image attachement using ie8, the file is displayed.
However, when he uses ie version greater than 8, the image is download.
A changes are made to phpbb/download/file.php to solve the problem.
We check now if the ie version is greater or equal to 8 and not only equal
to 8

PHPBB3-10820
2013-06-12 20:22:35 +05:30
Andreas Fischer
b4183eda0c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()

Conflicts:
	tests/mock/cache.php
2013-06-11 18:46:30 +02:00
Andreas Fischer
30801e1f0a Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-11 18:34:36 +02:00
Andreas Fischer
97c29c3876 Merge remote-tracking branch 'nickvergessen/ticket/11605' into develop
* nickvergessen/ticket/11605:
  [ticket/11605] Remove unused copied_files property
  [ticket/11605] Use empty_dir to better delete files and dirs of extensions
2013-06-11 17:13:29 +02:00
Andreas Fischer
6298cce464 Merge remote-tracking branch 'nickvergessen/ticket/11599' into develop
* nickvergessen/ticket/11599:
  [ticket/11599] Copy the forums into a static array for later reuse
2013-06-11 16:21:17 +02:00
Joas Schilling
d5f651c514 [ticket/11599] Copy the forums into a static array for later reuse
PHPBB3-11599
2013-06-11 16:16:17 +02:00
Joas Schilling
fa8d5c7d20 [ticket/11605] Remove unused copied_files property
PHPBB3-11605
2013-06-11 16:04:23 +02:00
Joas Schilling
d02f98c635 [ticket/11605] Use empty_dir to better delete files and dirs of extensions
PHPBB3-11605
2013-06-11 16:03:34 +02:00
Andreas Fischer
6f86c1dc76 Merge remote-tracking branch 'marc1706/ticket/11602' into develop
* marc1706/ticket/11602:
  [ticket/11602] Do not call localize_errors() if avatars are disabled
2013-06-11 15:08:26 +02:00
Marc Alexander
2d934704e2 [ticket/11602] Do not call localize_errors() if avatars are disabled
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.

PHPBB3-11602
2013-06-11 14:54:22 +02:00
Andreas Fischer
b74b84dbec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:50 +02:00
Andreas Fischer
949a443bfe Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympus
* nickvergessen/ticket/11601:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:43 +02:00
Andreas Fischer
fba093de05 Merge remote-tracking branch 'nickvergessen/ticket/11550' into develop
* nickvergessen/ticket/11550:
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
2013-06-11 14:35:54 +02:00
Joas Schilling
33bce3fac6 [ticket/11601] Add protected method for database sync and call it
PHPBB3-11601
2013-06-11 13:26:17 +02:00
Joas Schilling
5e8054f045 [ticket/11601] Split post_setup_synchronisation logic from xml parsing
PHPBB3-11601
2013-06-11 13:24:55 +02:00
Joas Schilling
007cd61776 [ticket/11550] Specify a valid path so it's clearer that it must be a path
PHPBB3-11550
2013-06-11 11:37:28 +02:00
Joas Schilling
68d15f0f14 [ticket/11550] Move comments to correct function
PHPBB3-11550
2013-06-11 11:14:24 +02:00
Joas Schilling
0b3f182083 [ticket/11550] We use a different fixture set for extension_acp_test.php
PHPBB3-11550
2013-06-09 17:40:33 +02:00
Dhruv
abd299b0a9 Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
  [ticket/10820] Fix function docblock

Conflicts:
	phpBB/download/file.php
2013-06-08 23:17:04 +05:30
Dhruv
96cf03f200 [ticket/10820] Fix function docblock
PHPBB3-10820
2013-06-08 23:13:45 +05:30
Joas Schilling
7546c3a7a7 [ticket/11550] Fixtures should only be directories not files
PHPBB3-11550
2013-06-08 17:14:20 +02:00