1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00

20043 Commits

Author SHA1 Message Date
Nathan Guse
36837e1975 Merge pull request #2109 from nickvergessen/ticket/11581
[ticket/11581] Hide categories on level 0 when they have no visible children
2014-03-13 19:31:22 -05:00
Joas Schilling
12b8460089 Merge remote-tracking branch 'crizz0/ticket/11787' into develop
* crizz0/ticket/11787:
  [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php
2014-03-14 00:22:01 +01:00
Joas Schilling
c695aa3903 Merge remote-tracking branch 'vsephpbb/ticket/12029' into develop
* vsephpbb/ticket/12029:
  [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
2014-03-13 23:55:19 +01:00
Joas Schilling
92b15fbdf8 Merge remote-tracking branch 'vsephpbb/ticket/11111' into develop
* vsephpbb/ticket/11111:
  [ticket/11111] Prosilver posting textarea may only be resized vertically
2014-03-13 23:49:29 +01:00
Joas Schilling
4f8cba3c82 Merge remote-tracking branch 'vsephpbb/ticket/12073' into develop
* vsephpbb/ticket/12073:
  [ticket/12073] Increase size of samp and code tags in ACP
2014-03-13 23:40:51 +01:00
Matt Friedman
2c0efd5d1b [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
PHPBB3-12029
2014-03-13 15:24:27 -07:00
Matt Friedman
2de3943cec [ticket/12073] Increase size of samp and code tags in ACP
PHPBB3-12073
2014-03-13 15:08:21 -07:00
Crizzo
0c02eae1ad [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php
PHPBB3-11787
2014-03-13 20:58:05 +01:00
Matt Friedman
21bec33e0b [ticket/11111] Prosilver posting textarea may only be resized vertically
The resize element displays a mechanism for allowing the
user to resize the element. Setting this to vertical means it
may only be resized vertically.

PHPBB3-11111
2014-03-13 12:47:28 -07:00
Joas Schilling
8a61e4b4c0 Merge remote-tracking branch 'crizz0/ticket/8785' into develop
* crizz0/ticket/8785:
  [ticket/8785] Deletes additional add and add_bcc buttons
  [ticket/8785] Fixed problem with add empty.png and travis will now pass
  [ticket/8785] and again a fresh line
  [ticket/8785] Just one blank line
  [ticket/8785] pm_layout.html back to more standard code
  [ticket/8785] <hr /> will only displayed when needed
  [ticket/8785] Adds blank lines at file end
  [ticket/8785] Adds a new optical improvement, new file and fixes html bugs
  [ticket/8785] Adds two <hr /> to seperate recipients and BCC
  [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
  [ticket/8785] Little spaces mistake
  [ticket/8785] Rebuilding posting_editor pm head + new language vars
2014-03-13 11:28:21 +01:00
Joas Schilling
6361d382b3 [ticket/11581] Add assertNotContainsLang() for functional test cases
PHPBB3-11581
2014-03-13 11:25:58 +01:00
Joas Schilling
eb1dd47e39 [ticket/11581] Hide categories when they have no visible children
PHPBB3-11581
2014-03-13 11:25:45 +01:00
Andreas Fischer
bd33855e7b Merge pull request #2110 from nickvergessen/ticket/12168
[ticket/12168] Move padding-top to ul.linklist li

* nickvergessen/ticket/12168:
  [ticket/12168] Move padding-top to ul.linklist li
2014-03-13 11:10:08 +01:00
Andreas Fischer
4ecfc07e03 Merge pull request #2113 from nickvergessen/ticket/8041
[ticket/8041] Merge item name into "Return to" string for better translations

* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations
2014-03-13 11:02:29 +01:00
Andreas Fischer
16e7a1d931 Merge pull request #2115 from Elsensee/ticket/12267
[ticket/12267] Replace $php_ext with $phpEx

* Elsensee/ticket/12267:
  [ticket/12267] Replace $php_ext with $phpEx
2014-03-13 11:00:31 +01:00
Oliver Schramm
86a88751a8 [ticket/12267] Replace $php_ext with $phpEx
PHPBB3-12267
2014-03-13 10:52:10 +01:00
Joas Schilling
db63d0fbf9 [ticket/8041] Add space/tabs after => in array list
PHPBB3-8041
2014-03-13 10:41:41 +01:00
Joas Schilling
dbebe30c9a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2014-03-13 10:27:19 +01:00
Joas Schilling
03eb23cbae Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
2014-03-13 10:16:41 +01:00
Andreas Fischer
e123b0c0a0 [ticket/12176] Reword comment about config entries.
PHPBB3-12176
2014-03-13 00:53:07 +01:00
Nathan Guse
d69012ea6d Merge pull request #2104 from nickvergessen/ticket/12261
[ticket/12261] Remove web root path from login redirect url
2014-03-12 18:48:41 -05:00
Andreas Fischer
d3ddf29e59 Merge pull request #6 from nickvergessen/ticket/bantu/12176
[ticket/12176] Add newest_user_colour to config array to ensure it exists

* nickvergessen/ticket/bantu/12176:
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
2014-03-13 00:17:59 +01:00
Joas Schilling
c6a87e77d4 Merge remote-tracking branch 'vsephpbb/ticket/12244' into develop
* vsephpbb/ticket/12244:
  [ticket/12244] Rename extensions manager tab
  [ticket/12244] Rename link to Extensions Manager in the ACP
2014-03-12 20:18:29 +01:00
Joas Schilling
ca92ed918a [ticket/12176] Add newest_user_colour to config array to ensure it exists
PHPBB3-12176
2014-03-12 20:08:55 +01:00
Joas Schilling
871a89af07 Merge remote-tracking branch 'EXreaction/ticket/11716' into develop
* EXreaction/ticket/11716:
  [ticket/11716] Correct license URL
  [ticket/11716] Fix dependencies in migration files
  [ticket/11716] Rename migration files and add note that it's converting a MOD
  [ticket/11716] Convert Soft Delete Mod to post/topic visibility
2014-03-12 18:51:14 +01:00
Joas Schilling
dfa077710f [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
PHPBB3-8041
2014-03-12 18:47:02 +01:00
Andreas Fischer
b809bea3d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"

Conflicts:
	phpBB/includes/functions_module.php
2014-03-12 16:28:47 +01:00
Andreas Fischer
d81a604ef8 Merge remote-tracking branch 'Crizz0/ticket/10549' into develop-olympus
* Crizz0/ticket/10549:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"
2014-03-12 16:25:01 +01:00
Joas Schilling
9419edd686 [ticket/8041] Merge item name into "Return to" string for better translations
PHPBB3-8041
2014-03-12 01:05:05 +01:00
Nathan Guse
c14d2fb60f [ticket/11716] Correct license URL
PHPBB3-11716
2014-03-11 18:43:03 -05:00
Nathan Guse
f75b98aa8b [ticket/11716] Fix dependencies in migration files
PHPBB3-11716
2014-03-11 18:34:35 -05:00
Crizzo
21961a25ba [ticket/8785] Deletes additional add and add_bcc buttons
PHPBB3-8785
2014-03-11 22:02:43 +01:00
Crizzo
d95d062a42 [ticket/10549] using correct variable in includes/functions_module.php too
PHPBB3-10549
2014-03-11 18:45:46 +01:00
Crizzo
239f72ddda [ticket/10549] changed "right" to "incorrect"
PHPBB3-10549
2014-03-11 18:24:35 +01:00
Joas Schilling
ad6fda5776 Merge remote-tracking branch 'rxu3/ticket/12260' into develop
* rxu3/ticket/12260:
  [ticket/12260] Add core events to delete_posts() function.
2014-03-11 17:55:38 +01:00
Matt Friedman
9b1620911d [ticket/12244] Rename extensions manager tab
PHPBB3-12244
2014-03-11 08:36:51 -07:00
rxu
e8b7f68406 [ticket/12260] Add core events to delete_posts() function.
Events for extensions to perform additional actions on posts deletion.

PHPBB3-12260
2014-03-11 23:31:11 +08:00
Joas Schilling
8eb15de406 [ticket/12168] Move padding-top to ul.linklist li
PHPBB3-12168
2014-03-11 11:26:13 +01:00
Joas Schilling
e07f314117 [ticket/12261] Mark test as incomplete, something is wrong with sessions
PHPBB3-12261
2014-03-11 11:05:27 +01:00
Dhruv
cf468bcc09 [ticket/11581] Fix year in copyright header
PHPBB3-11581
2014-03-11 10:38:20 +01:00
Dhruv
8b936fc8eb [ticket/11581] Enabled private messages after tests
PHPBB3-11581
2014-03-11 10:38:04 +01:00
Dhruv
ce4926d000 [ticket/11581] Add test to check UCP_PM is enabled/disabled correctly
PHPBB3-11581
2014-03-11 10:37:52 +01:00
Joas Schilling
5a43ea2067 Merge branch 'develop-olympus' into develop
* develop-olympus:
2014-03-11 09:54:01 +01:00
Joas Schilling
296af6c679 Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into develop
* dhruvgoel92/ticket/11271-develop: (25 commits)
  [ticket/11271] Make path conversion more precise
  [ticket/11271] limit absolute path conversion to attachment links only
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.
  [ticket/11271] Add the inline images html to content
  [ticket/11271] Use class variable $db instead of global
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  ...
2014-03-11 09:53:52 +01:00
Joas Schilling
e65a6dd8f4 Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus
* dhruvgoel92/ticket/11271:
  [ticket/11271] Make path conversion more precise
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.
2014-03-11 09:53:18 +01:00
Joas Schilling
65626d602e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11288] Handle +,- without preceeding whitespace characters
2014-03-11 09:48:32 +01:00
Joas Schilling
4b259e3c82 Merge remote-tracking branch 'dhruvgoel92/ticket/11288-develop' into develop
* dhruvgoel92/ticket/11288-develop:
  [ticket/11288] Add unit test cases for foo-bar like queries
  [ticket/11288] Handle +,- without preceeding whitespace characters
2014-03-11 09:48:24 +01:00
Joas Schilling
214f515e9c Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympus
* dhruvgoel92/ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters
2014-03-11 09:46:31 +01:00
Joas Schilling
37b19bc533 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12259] Reduce the size of our test matrix

Conflicts:
	.travis.yml
2014-03-11 09:15:33 +01:00
Joas Schilling
a35901c29b Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into develop-olympus
* EXreaction/ticket/12259-olympus:
  [ticket/12259] Reduce the size of our test matrix
2014-03-11 09:13:37 +01:00