1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 12:05:37 +02:00

16883 Commits

Author SHA1 Message Date
Andreas Fischer
60e474c551 Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into develop
* dhruvgoel92/ticket/11585:
  [ticket/11585] Make $auth_admin class property
2013-07-01 20:43:34 +02:00
Dhruv
9e3d5420ad [ticket/11585] Make $auth_admin class property
$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
2013-07-02 00:10:30 +05:30
Joas Schilling
8233c3e340 Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop
* dhruvgoel92/ticket/9341:
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [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
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars
2013-06-29 15:49:23 +02:00
Andreas Fischer
c0c4ce8b8b Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into develop
* dhruvgoel92/ticket/11593:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
2013-06-29 14:07:42 +02:00
Dhruv
5182ec09a5 [ticket/11593] initialize $is_expr as null before being passed to get_varref
PHPBB3-11593
2013-06-29 15:26:36 +05:30
Dhruv
91e773a795 [ticket/9341] Assert that page doesnt contain next or prev page posts
PHPBB3-9341
2013-06-28 01:02:00 +05:30
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
Andreas Fischer
f2b174c8b5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11618] Replace glob() with scandir() and string matching

Conflicts:
	tests/template/template_test.php
2013-06-27 02:23:57 +02:00
Andreas Fischer
960b20e45b Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
2013-06-27 02:08:48 +02:00
Joseph Warner
8e575487ff [ticket/11618] Replace glob() with scandir() and string matching
Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
2013-06-26 19:51:52 -04:00
Andreas Fischer
86234ea533 Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-06-27 01:22:01 +02:00
Andreas Fischer
e0c572d1d8 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:21:28 +02:00
Andreas Fischer
d0f0704515 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:12:34 +02:00
Andreas Fischer
95730c1ff1 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:09:52 +02:00
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
Andy Chase
7ba81a293f [ticket/11615] Fix typo in creation_test
PHPBB3-11615
2013-06-26 11:49:37 -07:00
Andy Chase
4c432fecc7 [ticket/11615] Remove magic number in creation_test
Removing this magic number to its own variable
with clean multiplication makes it clear
what the number represents.

PHPBB3-11615
2013-06-26 11:49:36 -07:00
Andy Chase
c29cca1a75 [ticket/11615] Rename class in file to match
PHPBB3-11615
2013-06-26 11:49:35 -07:00
Andy Chase
a105a6d7a7 [ticket/11615] Rename init_test to creation_test for clarity
PHPBB3-11615
2013-06-26 11:49:34 -07:00
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
Joas Schilling
a5c971176b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-21 17:12:58 +02:00
Joas Schilling
4828cb21cf Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympus
* dhruvgoel92/ticket/10776:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.
2013-06-21 16:32:59 +02:00
Dhruv
6cbb2d6136 [ticket/10776] update min php version 5.3.3 in readme
PHPBB3-10776
2013-06-21 18:24:06 +05:30
Joas Schilling
4ac5028d24 Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into develop
* dhruvgoel92/ticket/11503:
  [ticket/11503] similar implementation for mssql_native and odbc
2013-06-21 13:08:11 +02:00
Dhruv
116888f567 Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticket/10776
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-20 21:39:13 +05:30
Dhruv
3eeeaababd [ticket/11503] similar implementation for mssql_native and odbc
mssql_native and mssql_odbc db drivers varied at some places
where they should have been similar.

PHPBB3-11503
2013-06-20 19:16:21 +05:30
Joas Schilling
bb59875236 Merge branch 'develop-olympus' into develop
Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-06-20 12:03:50 +02:00
Joas Schilling
b9afc6f1a5 Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympus 2013-06-20 11:46:00 +02:00
Andreas Fischer
a72bf329d9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:53 +02:00
Andreas Fischer
47241878d0 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:46 +02:00
Andreas Fischer
1e4ad4c368 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:34:54 +02:00
Andreas Fischer
f365c99f14 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:29:21 +02:00
Joas Schilling
b362fb44d2 [ticket/11603] Fix out dated comment
PHPBB3-11603
2013-06-20 10:59:43 +02:00
Joas Schilling
5f4daba160 [ticket/11603] Fix usage note
PHPBB3-11603
2013-06-20 10:57:56 +02:00
Andreas Fischer
da958ccb4f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11094] Add textbox for jabber while memberlist search
2013-06-20 01:21:34 +02:00
Andreas Fischer
e47e36266d Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympus
* dhruvgoel92/ticket/11094:
  [ticket/11094] Add textbox for jabber while memberlist search
2013-06-20 01:16:21 +02:00
Andreas Fischer
1af6dc22e2 [ticket/11604] Skip installer step where config.php is created.
PHPBB3-11604
2013-06-19 17:03:41 +02:00
Joas Schilling
99e486dc82 [ticket/11603] Throw RuntimeExceptions instead of using exit()
PHPBB3-11603
2013-06-19 13:45:42 +02:00
Joas Schilling
1516ae7e7e [ticket/11603] Avoid using cURL
PHPBB3-11603
2013-06-19 13:38:03 +02:00
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
Andreas Fischer
21f839494d [ticket/11604] Fix case where config.php is not generated by phpBB.
PHPBB3-11604
2013-06-18 16:02:33 +02:00
Andreas Fischer
516581c41e [ticket/11604] Use variables for config.php filesnames.
PHPBB3-11604
2013-06-18 15:04:48 +02:00
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
Dhruv
50828e6d39 [ticket/11094] Add textbox for jabber while memberlist search
PHPBB3-11094
2013-06-15 18:41:43 +05:30
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