1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

17497 Commits

Author SHA1 Message Date
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
Matt Friedman
2de3943cec [ticket/12073] Increase size of samp and code tags in ACP
PHPBB3-12073
2014-03-13 15:08:21 -07: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
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
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
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
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
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
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
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
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
Nathan Guse
052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board

Conflicts:
	phpBB/language/en/acp/board.php
2014-03-10 21:51:07 -05:00
Nathan Guse
9aa947f7fb Merge pull request #2105 from Crizz0/ticket/12106
[ticket/12106] Adds a explaination that admin/mods still able to use the...
2014-03-10 21:49:29 -05:00
Nathan Guse
3181c44fc9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php
2014-03-10 21:44:04 -05:00
Nathan Guse
92b638ed83 Merge pull request #2107 from VSEphpbb/ticket/12117
[ticket/12117] Add get_all_tree_data method to tree class
2014-03-10 21:30:39 -05:00
Nathan Guse
23ea833425 Merge pull request #2101 from nickvergessen/ticket/10763
[ticket/10763] Do not call non-static functions statically
2014-03-10 20:51:20 -05:00
Nathan Guse
f7020fb5d1 Merge pull request #2092 from nickvergessen/ticket/12090
[ticket/12090] Pass route name to url() instead of the url itself
2014-03-10 20:50:08 -05:00
Matt Friedman
4127f92496 [ticket/12117] Select all fields instead of item_basic_data
PHPBB3-12117
2014-03-10 16:06:53 -07:00
Matt Friedman
c1115d9451 [ticket/12117] Add get_all_tree_data method to tree class
PHPBB3-12117
2014-03-10 15:59:45 -07:00
Joas Schilling
235f7c3721 Merge remote-tracking branch 'rxu3/ticket/12224' into develop
* rxu3/ticket/12224:
  [ticket/12224] Add assign_block_vars_array() test.
  [ticket/12224] Add template wrapper method to assign block arrays
2014-03-10 23:49:37 +01:00
Crizzo
957e9aabc3 [ticket/12106] Combined first and second sentence
PHPBB3-12106
2014-03-10 21:19:25 +01:00
Crizzo
13327a13a0 [ticket/12106] Adds a explaination that admin/mods still able to use the board
PHPBB3-12106
2014-03-10 18:50:39 +01:00
Crizzo
ec4c9833ca [ticket/10549] Adds language variables
PHPBB3-10549
2014-03-10 18:35:23 +01:00
Joas Schilling
e8fdc1545a [ticket/12261] Add a functional test for redirect after using login_box()
PHPBB3-12261
2014-03-10 12:35:30 +01:00
Joas Schilling
b876c07377 [ticket/12261] Remove web root path from login redirect url
The redirect url must be relative to the ucp.php and not relative to the
current page.

PHPBB3-12261
2014-03-10 10:15:38 +01:00
Nathan Guse
c169583dc3 Merge pull request #2089 from nickvergessen/ticket/12251
[ticket/12251] Clean up and Enhancement of Custom Profile Fields
2014-03-09 17:26:22 -05:00
Nathan Guse
20723a9315 Merge pull request #2099 from bantu/ticket/12256
[ticket/12256] Selecting founders is fetching $sql instead of $result
2014-03-09 16:55:28 -05:00
Crizzo
47ad92ae31 [ticket/8785] Fixed problem with add empty.png and travis will now pass
PHPBB3-8785
2014-03-09 22:14:40 +01:00
Joas Schilling
521c6c7d75 [ticket/10763] Do not call messenger::error() statically
PHPBB3-10763
2014-03-09 22:03:38 +01:00
Joas Schilling
37dace4967 [ticket/10763] Do not call non-static transfer() statically
PHPBB3-10763
2014-03-09 21:53:21 +01:00
Crizzo
0fd172aaa4 [ticket/8785] and again a fresh line
PHPBB3-8785
2014-03-09 21:50:44 +01:00
Joas Schilling
38aef98a69 [ticket/10763] Fix static calls to non static methods in colour_manager
PHPBB3-10763
2014-03-09 21:42:59 +01:00
Joas Schilling
12dc36903e [ticket/10763] Do not call set_post_visibility() statically
PHPBB3-10763
2014-03-09 21:38:32 +01:00