makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 08:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
19105 commits 18 branches 192 tags 206 MiB
Commit graph

8174 commits

Author SHA1 Message Date
Marc Alexander
01a2622dc6 [ticket/11323] Correctly treat variables in template defines 
Previously, any template variables that were used when defining a variable
were treated as strings. This is a regression to phpBB 3.0. With this
patch the template variables will be properly parsed.

PHPBB3-11323
 2013-02-19 16:08:28 +01:00
Marc Alexander
3cc4746ad3 [feature/avatars] Use "Main" as category for avatars in root of gallery 
Before this change the whole avatar gallery path would show as category.
Additionally, the avatars that were selected like that had an incorrect
path and didn't show up correctly.
With this patch it'll display "Main" as category and properly work.

PHPBBB3-10018
 2013-02-19 12:45:08 +01:00
Marc Alexander
a9e0aea4b1 [feature/avatars] Remove trailing whitespace from avatar code 
PHPBB3-10018
 2013-02-19 12:30:14 +01:00
Marc Alexander
2302cd7a42 [feature/avatars] Pass phpbb_user to prepare and process form functions 
The phpbb_user object might be used for language variables and other
things.

PHPBB3-10018
 2013-02-19 12:24:21 +01:00
Dhruv
1ee4702ec5 [ticket/11179] remove extra & in function call 
PHPBB3-11179
 2013-02-19 00:52:56 +05:30
Dhruv
38bb7dca31 [ticket/11179] correct start parameter in sphinx search 
PHPBB3-11179
 2013-02-19 00:52:55 +05:30
Dhruv
2ff874fe93 [ticket/11179] correct start parameter in native author search 
PHPBB3-11179
 2013-02-19 00:52:54 +05:30
Dhruv
a0ae223ef4 [ticket/11179] correct start parameter in native keyword search 
PHPBB3-11179
 2013-02-19 00:52:53 +05:30
Dhruv
8b7f306897 [ticket/11179] fix success query path for postgres 
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
 2013-02-19 00:52:52 +05:30
Dhruv
f0d63594e6 [ticket/11179] fix success query path for mysql 
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
 2013-02-19 00:52:51 +05:30
Dhruv
16bbdf4a52 [ticket/11179] minor fixes 
Amends comments to start with capitals. Reinsert blank lines which were
not supposed to be removed

PHPBB3-11179
 2013-02-19 00:52:50 +05:30
Dhruv
bc77ca4d4e [ticket/11179] pass start param by reference in postgres 
PHPBB3-11179
 2013-02-19 00:52:49 +05:30
Dhruv
ef88edbcf6 [ticket/11179] correct start param in author search of postgres 
PHPBB3-11179
 2013-02-19 00:52:48 +05:30
Dhruv
2cb48f0341 [ticket/11179] correct start parameter in psql keyword search 
PHPBB3-11179
 2013-02-19 00:52:47 +05:30
Dhruv
80f8e3abce [ticket/11179] pass start param by reference in author search 
PHPBB3-11179
 2013-02-19 00:52:46 +05:30
Dhruv
2601411a9c [ticket/11179] correct start parameter for author search 
PHPBB3-11179
 2013-02-19 00:52:45 +05:30
Dhruv
1c9c666ef1 [ticket/11179] use FOUND_ROWS query to re-search with changed start param 
PHPBB3-11179
 2013-02-19 00:52:44 +05:30
Dhruv
3e5ef8ab2c [ticket/11179] pass start parameter by reference 
start parameter is passed by reference so that in case it is not in bounds
the changes made to it are reflected back to the phpBB/search.php file

PHPBB3-11179
 2013-02-19 00:52:43 +05:30
Dhruv
00d34617cc [ticket/11179] correct the start parameter while retrieving from cache 
Start parameter if not between 0 and the total result count of the cached
search results is changed accordingly

PHPBB3-11179
 2013-02-19 00:52:42 +05:30
Dhruv
737b99966d [ticket/11179] add search query in case initial one fails 
changes the start parameter according to the total search results and
executes the search query again to get the results.

PHPBB3-11179
 2013-02-19 00:52:41 +05:30
Dhruv
38360c71f2 [ticket/11359] html escape sphinx config data 
PHPBB3-11359
 2013-02-18 14:13:31 +05:30
Dhruv
3c6256b3e7 [ticket/11359] add id attribute to textarea 
PHPBB3-11359
 2013-02-18 14:05:25 +05:30
Dhruv
5b99f0c113 [ticket/11359] close span 
PHPBB3-11359
 2013-02-18 14:01:46 +05:30
Nathan Guse
872773a218 [feature/migrations] Use getLocalisedMessage() function to get error message 
PHPBB3-11318
 2013-02-15 22:22:13 -06:00
Nathan Guse
f6bb14569b [feature/migrations] getLocalisedMessage function for migration exception 
PHPBB3-11351
 2013-02-15 22:19:24 -06:00
Nathan Guse
7ad577a86a [ticket/11103] Add Notification Settings link in flyout menu 
PHPBB3-11103
 2013-02-15 16:02:33 -06:00
Marc Alexander
f09e6865f7 [feature/avatars] Document the use of the allowed extensions array 
PHPBB3-10018
 2013-02-13 01:07:02 +01:00
Andreas Fischer
9a5263c63c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11196] Changed 401 response message in session.php.
 2013-02-12 23:06:17 +01:00
erangamapa
8ec55b062d [ticket/11196] Changed 401 response message in session.php. 
In session.php 401 response message was "Not Authorized".
I changed it to "Unauthorized".

PHPBB3-11196
 2013-02-12 23:04:55 +01:00
Dhruv
6b00a6bb7d [ticket/11303] remove additional brackets 
PHPBB3-11303
 2013-02-12 21:09:26 +05:30
Nathaniel Guse
54e9f7b50a Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103 
# By Nathan Guse (28) and others
# Via Andreas Fischer (9) and others
* 'develop' of https://github.com/phpbb/phpbb3: (90 commits)
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
  [feature/migrations] Remove default values from necessary parameters
  [ticket/11201] Revert WLM dropping because it is still used in China.
  [ticket/11220] Improvement to the info pop-up from "list="
  [feature/migrations] Revert unrelated changes to functions.php
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
  [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
  [ticket/10050] removing prosilver edits
  [ticket/9737] Fix some comments
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.
  [ticket/11338] Travis CI: Install PHP extension for redis key-value store.
  [ticket/10050] adding .topicrow to template condition
  [ticket/9737] Fix a few minor things in migrations
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/config/tables.yml
 2013-02-11 21:37:15 -06:00
Nathaniel Guse
f9a1b27a99 [feature/migrations] Fix unfulfillable function 
Returned unfulfillable name in the wrong place previously

PHPBB3-11351
 2013-02-09 21:16:39 -06:00
Nathaniel Guse
f18b096df9 [feature/migrations] getParameters function for migration exception 
PHPBB3-11351
 2013-02-09 21:10:56 -06:00
Nathaniel Guse
b398fa2050 [feature/migrations] Catch and display errors from the migrator 
PHPBB3-11318
 2013-02-09 21:09:29 -06:00
Nathaniel Guse
cacaffee6e [feature/migrations] Add language strings for migrations errors 
Unfulfillable returns string of the missing dependency name now if
the migration is unfulfillable (this is significantly more helpful).

PHPBB3-11351
 2013-02-09 20:56:42 -06:00
Nathaniel Guse
fc4d5f74c0 [feature/migrations] Call revert correctly when purging an extension 
PHPBB3-11318
 2013-02-09 20:05:39 -06:00
Nathaniel Guse
a8da6b89e9 [feature/migrations] Inject Migrator instead of using the container to fetch 
PHPBB3-11318
 2013-02-09 20:01:40 -06:00
Nathaniel Guse
ec9328e943 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/migrations-extensions 
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
 2013-02-09 19:51:18 -06:00
Dhruv
8e3aa08845 [ticket/11303] add S_TZ_PRESELECT template var 
add a new template variable to check if timezone has already been selected
by the user while registeration.

PHPBB3-11303
 2013-02-08 16:22:36 +05:30
Igor Wiedler
fa33eae556 Merge remote-tracking branch 'exreaction/ticket/11350' into develop 
* exreaction/ticket/11350:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
 2013-02-07 00:56:31 +01:00
Marc Alexander
5a4da46f9b [feature/avatars] Use array for allowed extensions and implode if needed 
PHPBB3-10018
 2013-02-07 00:08:53 +01:00
Marc Alexander
c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars 
Conflicts:
	phpBB/config/services.yml
 2013-02-07 00:07:59 +01:00
Nathaniel Guse
5705c3d377 [feature/migrations] Fix path to extension migrations 
PHPBB3-11318
 2013-02-06 13:14:40 -06:00
Nathaniel Guse
daf243026a [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver 
PHPBB3-11350
 2013-02-06 13:08:35 -06:00
Nathan Guse
a665ad5c2e [feature/migrations] Remove user_msnm migration 
PHPBB3-9737
 2013-02-06 11:35:56 -06:00
Nathan Guse
e4afb68dc3 [feature/migrations] Correct depends_on 
PHPBB3-9737
 2013-02-06 11:35:56 -06:00
Nathan Guse
58507f250b [feature/migrations] Subdirectories for migration data 
Organization will set you free

PHPBB3-9737
 2013-02-06 11:35:56 -06:00
Nathan Guse
747e514918 [feature/migrations] Reports table schema changes in recent develop 
PHPBB3-9737
 2013-02-06 11:35:55 -06:00
Nathan Guse
5e69e1a761 [feature/migrations] effectively installed check for migration data 
PHPBB3-9737
 2013-02-06 11:35:55 -06:00
Nathan Guse
dfcf9966e9 [feature/migrations] Comments for the return in the custom functions 
PHPBB3-11318
 2013-02-06 11:35:54 -06:00