Nils Adermann
81daf21dc0
Merge pull request #1324 from nickvergessen/ticket/10844-2
...
Ticket/10844 Extensions are not located when front-end file has a diffferent phpbb_root_path
2013-04-24 09:52:57 -07:00
Nils Adermann
3e32655c7f
Merge pull request #1290 from nickvergessen/ticket/11362
...
Correctly sanitise the directory path in finder
2013-04-24 09:45:34 -07:00
Joas Schilling
16e70fa086
[ticket/11362] Use container when available instead of creating a new instance
...
PHPBB3-11362
2013-04-22 00:49:41 +02:00
Joas Schilling
10781ce9ae
[ticket/10844] Increase prefix to not match template/ in finder test
...
PHPBB3-10844
2013-04-22 00:24:30 +02:00
Joas Schilling
12c432c523
[ticket/10844] Add extension template file to locate
...
PHPBB3-10844
2013-04-22 00:23:49 +02:00
Andreas Fischer
ab628cbdb9
Merge remote-tracking branch 'nickvergessen/ticket/10966-2' into develop
...
* nickvergessen/ticket/10966-2:
[ticket/10966] Introduce MSSQL base class for native and ODBC
2013-04-19 17:58:45 -04:00
Joas Schilling
db5df5b6ac
[ticket/10966] Introduce MSSQL base class for native and ODBC
...
PHPBB3-10966
2013-04-19 19:11:22 +02:00
Andreas Fischer
ae240930cd
Merge remote-tracking branch 'nickvergessen/ticket/11501' into develop
...
* nickvergessen/ticket/11501:
[ticket/11501] Remove test_ prefix from data provider methods
[ticket/11501] Assert the variables instead of fail() with the condition
2013-04-18 21:18:55 -04:00
Joas Schilling
1431a02756
[ticket/11501] Remove test_ prefix from data provider methods
...
PHPBB3-11501
2013-04-19 01:49:35 +02:00
Joas Schilling
845832820b
[ticket/11501] Assert the variables instead of fail() with the condition
...
PHPBB3-11501
2013-04-19 01:48:31 +02:00
Andreas Fischer
a59007c4fe
Merge remote-tracking branch 'nickvergessen/ticket/10966' into develop
...
* nickvergessen/ticket/10966:
[ticket/10966] Introduce MySQL base class
2013-04-18 18:43:13 -04:00
Joas Schilling
ccd4a725da
[ticket/11362] Add compatibility function phpbb_clean_path() again
...
The function first depends on the container, but also works without it and
without autoload. The reason for this is, it might be used before that
stuff is set up, like it has been in our common.php
PHPBB3-11362
2013-04-18 09:53:02 +02:00
Joas Schilling
e2875a7e17
[ticket/10966] Introduce MySQL base class
...
PHPBB3-10966
2013-04-17 21:25:35 +02:00
Joas Schilling
ffe9f2a93e
[ticket/11362] Fix service description of finder
...
PHPBB3-11362
2013-04-17 20:25:30 +02:00
Joas Schilling
423b310e2a
[ticket/11362] Extension manager depends on filesystem
...
PHPBB3-11362
2013-04-17 18:43:19 +02:00
Joas Schilling
d7fb934a2f
[ticket/11362] Replace other calls to phpbb_clean_path
...
Need to instantiate the object manually here, as the container is not yet
set up.
PHPBB3-11362
2013-04-17 17:53:44 +02:00
Joas Schilling
158bce0209
[ticket/11362] Use new filesystem class in finder
...
PHPBB3-11362
2013-04-17 17:50:44 +02:00
Joas Schilling
869e00a23b
[ticket/11362] Move phpbb_clean_path into a simple filesystem service
...
PHPBB3-11362
2013-04-17 17:46:58 +02:00
Andreas Fischer
a0d10cd7fc
Merge remote-tracking branch 'nickvergessen/ticket/11491' into develop
...
* nickvergessen/ticket/11491:
[ticket/11491] Copy files back only if we saved them previously
[ticket/11491] Only copy files from phpBB/ext/ the directory exists
[ticket/11491] Correctly remove the store/temp_ext/ directory after use
[ticket/11491] Fix path to the ext/ folder
[ticket/11491] Add extension_acp_test.php to functional group
[ticket/11491] Fix class name of functional test
[ticket/11491] Move file to correct directory
2013-04-15 14:56:13 -04:00
Andreas Fischer
fbe115b434
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11493] add checks for Notice and Warning
[ticket/11493] add check for phpBB Debug in functional tests
2013-04-15 14:27:52 -04:00
Andreas Fischer
453f98f6d3
Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympus
...
* dhruvgoel92/ticket/11493:
[ticket/11493] add checks for Notice and Warning
[ticket/11493] add check for phpBB Debug in functional tests
2013-04-15 13:15:03 -04:00
Andreas Fischer
b43ed11470
Merge remote-tracking branch 'marc1706/ticket/11488' into develop
...
* marc1706/ticket/11488:
[ticket/11488] Use correct base class in email notification method
2013-04-15 13:10:10 -04:00
Dhruv
14071e6085
[ticket/11493] add checks for Notice and Warning
...
PHPBB3-11493
2013-04-15 22:02:21 +05:30
Dhruv
82a630cd64
[ticket/11493] add check for phpBB Debug in functional tests
...
PHPBB3-11493
2013-04-15 20:41:05 +05:30
Marc Alexander
c1dedabdfb
[ticket/11488] Use correct base class in email notification method
...
In ticket/11451 this was not correctly changed to reflect the new class
phpbb_notifcation_method_messenger_base. Additionally, an undefined
variable error has been fixed in messenger_base.php (change should be
confirmed by bantu though).
PHPBB3-11488
2013-04-15 12:50:21 +02:00
Andreas Fischer
bf98122cf4
Merge remote-tracking branch 'nickvergessen/ticket/11494' into develop
...
* nickvergessen/ticket/11494:
[ticket/11494] Filter crawler in first place
[ticket/11494] Use functions instead of repeating
[ticket/11494] Fix memberlist leaders functional tests
2013-04-14 21:40:01 -04:00
Joas Schilling
6bcc220df3
[ticket/11494] Filter crawler in first place
...
PHPBB3-11494
2013-04-15 03:37:03 +02:00
Joas Schilling
cbfe866eba
[ticket/11494] Use functions instead of repeating
...
PHPBB3-11494
2013-04-13 18:03:02 +02:00
Andreas Fischer
ec33bada93
Merge remote-tracking branch 'hjpotter92/ticket/11225' into develop
...
* hjpotter92/ticket/11225:
[ticket/11225] Deletion of unused mcp_jumpbox.html file
2013-04-13 00:23:22 -04:00
Joas Schilling
06e32e36df
[ticket/10844] Add unit tests for different root_paths
...
PHPBB3-10844
2013-04-12 21:35:08 +02:00
Joas Schilling
bbaa3411b0
[ticket/10844] Make sure ext_path has no trailing slash
...
PHPBB3-10844
2013-04-12 21:35:07 +02:00
Joas Schilling
6a3d77d76e
[ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_provider
...
The phpbb_root_path needs to be removed from the style path, before giving
the path to the finder, because the finder prepends it later again and is
therefor unable to find style files when the root path is not ./
PHPBB3-10844
2013-04-12 21:35:06 +02:00
Nils Adermann
c25dfef770
Merge pull request #1184 from marc1706/ticket/11314
...
[ticket/11314] Improve readability and code cleanup in new JavaScript files
2013-04-12 06:32:13 -07:00
Nils Adermann
653666c76e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11358] Removed all trailing white spaces.
[ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:56 +02:00
Nils Adermann
0ce94fde77
Merge branch 'ticket/11358' into develop-olympus
...
* ticket/11358:
[ticket/11358] Removed all trailing white spaces.
[ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:24 +02:00
erangamapa
7d8bbcd596
[ticket/11358] Removed all trailing white spaces.
...
Removed all trailing white spaces with new lines.
PHPBB3-11358
2013-04-12 14:03:06 +02:00
erangamapa
00b45fa4dc
[ticket/11358] Fixed the code according to coding guidlines.
...
Added proper indentation and new line after break in switch
statement.
PHPBB3-11358
2013-04-12 14:02:51 +02:00
Joas Schilling
13ca1f5598
[ticket/11491] Copy files back only if we saved them previously
...
PHPBB3-11491
2013-04-12 02:18:38 +02:00
Joas Schilling
3436e3f102
[ticket/11491] Only copy files from phpBB/ext/ the directory exists
...
PHPBB3-11491
2013-04-12 02:03:58 +02:00
Joas Schilling
0b64db275b
[ticket/11491] Correctly remove the store/temp_ext/ directory after use
...
PHPBB3-11491
2013-04-12 01:40:45 +02:00
Joas Schilling
56bcf7497e
[ticket/11491] Fix path to the ext/ folder
...
PHPBB3-11491
2013-04-12 01:10:09 +02:00
Joas Schilling
08e7bd6166
[ticket/11491] Add extension_acp_test.php to functional group
...
PHPBB3-11491
2013-04-12 01:09:09 +02:00
Joas Schilling
4c99229be8
[ticket/11491] Fix class name of functional test
...
PHPBB3-11491
2013-04-12 01:08:40 +02:00
Joas Schilling
b2b8b62fad
[ticket/11491] Move file to correct directory
...
PHPBB3-11491
2013-04-12 01:08:09 +02:00
Joas Schilling
5c24474c2a
[ticket/11494] Fix memberlist leaders functional tests
...
The scope of the crawler should be reduced to the specific table
PHPBB3-11494
2013-04-11 22:11:52 +02:00
Andreas Fischer
d071d57a1b
Merge remote-tracking branch 'rechosen/ticket/11116' into develop
...
* rechosen/ticket/11116:
[ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
2013-04-11 15:18:29 -04:00
Nils Adermann
08e7e8722a
Merge pull request #1336 from nickvergessen/ticket/11492
...
[ticket/11492] Fix error on teampage when there are no users.
2013-04-11 08:19:32 -07:00
Joas Schilling
1296417b52
[ticket/11492] Initialize $user_ids and $group_users arrays
...
Also avoid unneccessary calls to permissions when user_ids is empty
PHPBB3-11492
2013-04-11 16:38:14 +02:00
Joas Schilling
4d4cf25edd
[ticket/11492] Fix the test once more
...
PHPBB3-11492
2013-04-11 16:29:15 +02:00
Joas Schilling
7f527e8012
[ticket/11492] Fix issues with log object
...
PHPBB3-11492
2013-04-11 16:05:04 +02:00