Commit graph

22865 commits

Author SHA1 Message Date
Joas Schilling
e45cd32de7 [ticket/12763] Do not regenerate the *_schema.sql files
PHPBB3-12763
2014-06-23 21:39:34 +02:00
Crizzo
aff67b99b5 [ticket/12680] Adds variable for guest user
PHPBB3-12680
2014-06-23 20:49:25 +02:00
Andreas Fischer
c0699c88f8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
2014-06-23 20:38:12 +02:00
Andreas Fischer
8332671813 Merge pull request #2587 from dhruvgoel92/ticket/11528
[ticket/11528] Refactor install_board( ) into a new mink class

* dhruvgoel92/ticket/11528:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
2014-06-23 20:38:11 +02:00
Marc Alexander
8817b59377 [ticket/12755] Add language string for timed out remote upload
PHPBB3-12755
2014-06-23 20:35:36 +02:00
Crizzo
8984dc6103 [ticket/12680] Brings back get_username_string()
PHPBB3-12680
2014-06-23 20:12:12 +02:00
Joas Schilling
22fc5cedbe Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12532] Move logged_out event into its own <li>
  [ticket/12532] Fix tab -> space indentation in events.md
  [ticket/12532] Add navbar_header_logged_out_content event
  [ticket/12532] Add navbar_header_username_append/prepend
2014-06-23 20:06:43 +02:00
Joas Schilling
052a4e6f58 Merge pull request #2640 from dhruvgoel92/ticket/12532
[ticket/12532] Add navbar_header_username_append/prepend

* dhruvgoel92/ticket/12532:
  [ticket/12532] Move logged_out event into its own <li>
  [ticket/12532] Fix tab -> space indentation in events.md
  [ticket/12532] Add navbar_header_logged_out_content event
  [ticket/12532] Add navbar_header_username_append/prepend
2014-06-23 20:05:01 +02:00
Joas Schilling
c60d444607 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12696] Typo
  [ticket/12696] Change some parts
  [ticket/12696] Naming convention changes
  [ticket/12696] A small error with events.md perms
  [ticket/12696] Add events to evets.md
  [ticket/12696] Add prosilver ucp_register
  [ticket/12696] Add events to ucp_register.html
2014-06-23 19:50:12 +02:00
Joas Schilling
ec4924cf14 Merge pull request #2581 from lucifer4o/ticket/12696
[Ticket/12696] Add events to ucp_register.html

* lucifer4o/ticket/12696:
  [ticket/12696] Typo
  [ticket/12696] Change some parts
  [ticket/12696] Naming convention changes
  [ticket/12696] A small error with events.md perms
  [ticket/12696] Add events to evets.md
  [ticket/12696] Add prosilver ucp_register
  [ticket/12696] Add events to ucp_register.html
2014-06-23 19:49:21 +02:00
Joas Schilling
48bd10902b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12690] Find a space
  [ticket/12690] Remove $msg_id and chmod
  [ticket/12690] Add other info to core.submit_pm_after
  [ticket/12690] Add core.submit_pm_after event
2014-06-23 19:46:59 +02:00
Joas Schilling
c740772d93 Merge pull request #2574 from lucifer4o/ticket/12690
[ticket/12690] Add core.submit_pm_after event

* lucifer4o/ticket/12690:
  [ticket/12690] Find a space
  [ticket/12690] Remove $msg_id and chmod
  [ticket/12690] Add other info to core.submit_pm_after
  [ticket/12690] Add core.submit_pm_after event
2014-06-23 19:46:50 +02:00
Joas Schilling
3a502143c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12728] Adjust .postimage sizing to 100%
  [ticket/12728] Enforce box model sizing on image attachment thumbnails
2014-06-23 19:42:58 +02:00
Joas Schilling
08f244229c Merge pull request #2609 from VSEphpbb/ticket/12728
[ticket/12728] Enforce box model sizing on image attachment thumbnails

* VSEphpbb/ticket/12728:
  [ticket/12728] Adjust .postimage sizing to 100%
  [ticket/12728] Enforce box model sizing on image attachment thumbnails
2014-06-23 19:42:19 +02:00
Tristan Darricau
26eb15ffab [ticket/12762] Make ext.php optional for extensions
PHPBB3-12762
2014-06-23 19:39:19 +02:00
Crizzo
453f2904c2 [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
PHPBB3-12680
2014-06-23 19:38:44 +02:00
Dhruv
6be8c98296 Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12563] Adds &laquo; and &raquo; to the links in acp_styles.php
  [ticket/12563] Removes ending . from <a>
  [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
  [ticket/12563] Changes 2 language variables to better understandable names
2014-06-23 22:07:15 +05:30
Dhruv Goel
dfbe072d51 Merge pull request #2571 from Crizz0/ticket/12563
[ticket/12563] Changes 2 style specific language variables for better understanding
2014-06-23 22:04:20 +05:30
Dhruv
61fa0908bc [ticket/11528] Change click_submit() to accept id as param
PHPBB3-11528
2014-06-23 21:24:29 +05:30
Dhruv
2147a5eba5 [ticket/11528] Handle case when config file cant be written by installer
PHPBB3-11528
2014-06-23 21:23:47 +05:30
Nils Adermann
9f91e8e9bd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12612] Move functions from mcp.php to functions_mcp.php
  [ticket/12612] Move function from ucp.php to functions_user.php
  [ticket/12612] Move functions from memberlist.php to functions_display.php
  [ticket/12612] Move functions from posting.php to functions_posting.php
2014-06-23 11:19:39 -04:00
Nils Adermann
1f9e1fd177 Merge remote-tracking branch 'github-nickvergessen/ticket/12612-ascraeus' into develop-ascraeus
* github-nickvergessen/ticket/12612-ascraeus:
  [ticket/12612] Move functions from mcp.php to functions_mcp.php
  [ticket/12612] Move function from ucp.php to functions_user.php
  [ticket/12612] Move functions from memberlist.php to functions_display.php
  [ticket/12612] Move functions from posting.php to functions_posting.php
2014-06-23 11:19:15 -04:00
Dhruv
12590af750 [ticket/12532] Move logged_out event into its own <li>
PHPBB3-12532
2014-06-23 19:59:59 +05:30
imkingdavid
5b02613a83 [ticket/12532] Fix tab -> space indentation in events.md
PHPBB3-12532
2014-06-23 19:56:36 +05:30
imkingdavid
99e9f198b0 [ticket/12532] Add navbar_header_logged_out_content event
PHPBB3-12532
2014-06-23 19:56:34 +05:30
David King
3113963cb6 [ticket/12532] Add navbar_header_username_append/prepend
PHPBB3-12532
2014-06-23 19:56:33 +05:30
Andreas Fischer
b79aa2bf78 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12761] Remove the execute bit from functions_user.php
2014-06-23 16:17:14 +02:00
Andreas Fischer
4cb7cbd093 Merge pull request #2639 from n-aleha/ticket/12761
[ticket/12761] Remove the execute bit from functions_user.php

* n-aleha/ticket/12761:
  [ticket/12761] Remove the execute bit from functions_user.php
2014-06-23 16:17:14 +02:00
n-aleha
ec69a22899 [ticket/12761] Remove the execute bit from functions_user.php
PHPBB3-12761
2014-06-23 17:13:03 +03:00
Andreas Fischer
647869721d Merge pull request #2625 from Nicofuma/ticket/12726
[ticket/12726] Add Code Sniffer sniff ensuring PHP files do not contain any unused use statements

* Nicofuma/ticket/12726:
  [ticket/12726] Fix coding style
  [ticket/12726] Update error message
  [ticket/12726] Fix coding style
  [ticket/12726] Ensure PHP files do not contain any unused use statements
  [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
2014-06-23 00:53:55 +02:00
Andreas Fischer
52f731f582 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12726] Fix coding style
  [ticket/12726] Update error message
  [ticket/12726] Fix coding style
  [ticket/12726] Ensure PHP files do not contain any unused use statements
  [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
2014-06-23 00:53:55 +02:00
Cesar G
804ba0145a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
2014-06-22 15:44:29 -07:00
Cesar G
74a37259f7 Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeus
* PayBas/ticket/12608:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
2014-06-22 15:44:06 -07:00
Stanislav Atanasov
1d5e94ba36 [ticket/12696] Typo
Fixing typo

PHPBB3-12696
2014-06-23 01:02:06 +03:00
Tristan Darricau
7958a97fdd [ticket/12726] Fix coding style
PHPBB3-12726
2014-06-22 23:57:39 +02:00
Tristan Darricau
147ae8374c [ticket/12726] Update error message
PHPBB3-12726
2014-06-22 23:52:19 +02:00
Tristan Darricau
2ff9064ffb [ticket/12726] Fix coding style
PHPBB3-12726
2014-06-22 23:52:17 +02:00
Tristan Darricau
fa5afb60aa [ticket/12726] Ensure PHP files do not contain any unused use statements
PHPBB3-12726
2014-06-22 23:52:16 +02:00
Tristan Darricau
e46ef86104 [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
PHPBB3-12726
2014-06-22 23:52:14 +02:00
Andreas Fischer
80e0851189 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird
2014-06-22 23:41:26 +02:00
Andreas Fischer
4f2acbaed2 Merge pull request #2629 from nickvergessen/ticket/12747
[ticket/12747] Drop support for Firebird

* nickvergessen/ticket/12747:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird

Conflicts:
	phpBB/phpbb/db/driver/firebird.php
2014-06-22 23:41:14 +02:00
Joas Schilling
d18d3b30c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:13:14 +02:00
Joas Schilling
de04304e94 Merge pull request #2591 from rxu/ticket/12704
[ticket/12704] Improve the load time information in the footer when enabled

* rxu/ticket/12704:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:09:21 +02:00
Joas Schilling
4f6255687e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12714] Move "allow all forums" in its own dd-element
2014-06-22 23:02:09 +02:00
Joas Schilling
d3b3e9265c Merge pull request #2597 from Skouat/ticket/12714
[ticket/12714] Switching the description of radio buttons to align the correct description above the listbox

* Skouat/ticket/12714:
  [ticket/12714] Move "allow all forums" in its own dd-element
2014-06-22 23:01:32 +02:00
Joas Schilling
d37eb036aa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
2014-06-22 22:59:42 +02:00
Joas Schilling
bb8be29fd5 Merge pull request #2575 from lucifer4o/ticket/12691
[ticket/12691] Add core.delete_pm to funtion delete_pm

* lucifer4o/ticket/12691:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
2014-06-22 22:59:37 +02:00
Joas Schilling
a73fda8b42 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12701] Add change
  [ticket/12701] Rmove before event and expand modify_data
  [ticket/12701] Add events to user_add function
2014-06-22 22:57:47 +02:00
Joas Schilling
1e97502d90 Merge pull request #2586 from lucifer4o/ticket/12701
[Ticket/12701] Add events to user_add function

* lucifer4o/ticket/12701:
  [ticket/12701] Add change
  [ticket/12701] Rmove before event and expand modify_data
  [ticket/12701] Add events to user_add function
2014-06-22 22:57:40 +02:00
PayBas
1a3c1d5b9a [ticket/12608] Change CSS classes to prevent styling conflicts
PHPBB3-12608
2014-06-22 22:41:56 +02:00