1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00

15383 Commits

Author SHA1 Message Date
David King
0987efa189 Merge remote-tracking branch 'EXreaction/ticket/11351' into develop
# By Nathaniel Guse (4) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11351:
  [feature/migrations] getLocalisedMessage function for migration exception
  [feature/migrations] Fix unfulfillable function
  [feature/migrations] getParameters function for migration exception
  [feature/migrations] Add explanatory language string for migration errors
  [feature/migrations] Add language strings for migrations errors
2013-02-23 13:50:53 -05:00
Oleg Pudeyev
3e90082dbb Merge PR branch 'dhruvgoel92/ticket/11179' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11179:
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  [ticket/11179] fix success query path for postgres
  [ticket/11179] fix success query path for mysql
  [ticket/11179] minor fixes
  [ticket/11179] pass start param by reference in postgres
  [ticket/11179] correct start param in author search of postgres
  [ticket/11179] correct start parameter in psql keyword search
  [ticket/11179] pass start param by reference in author search
  [ticket/11179] correct start parameter for author search
  [ticket/11179] use FOUND_ROWS query to re-search with changed start param
  [ticket/11179] pass start parameter by reference
  [ticket/11179] correct the start parameter while retrieving from cache
  [ticket/11179] add search query in case initial one fails
2013-02-18 18:44:04 -05: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
Oleg Pudeyev
0f89b48820 Merge PR branch 'dhruvgoel92/ticket/11359' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11359:
  [ticket/11359] html escape sphinx config data
  [ticket/11359] add id attribute to textarea
  [ticket/11359] close span
2013-02-18 04:34:26 -05:00
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
f6bb14569b [feature/migrations] getLocalisedMessage function for migration exception
PHPBB3-11351
2013-02-15 22:19:24 -06: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
Andreas Fischer
42b211a4a1 Merge branch 'ticket/erangamapa/11196' into develop-olympus
* ticket/erangamapa/11196:
  [ticket/11196] Changed 401 response message in session.php.
2013-02-12 23:05:59 +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
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
f409697137 [feature/migrations] Add explanatory language string for migration errors
This should be used if an exception is thrown to inform the user of
what occurred.

PHPBB3-11351
2013-02-09 21:06:08 -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
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
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
David King
effaef6bdd Merge remote-tracking branch 'EXreaction/feature/migrations' into develop
* EXreaction/feature/migrations: (48 commits)
  [feature/migrations] Remove default values from necessary parameters
  [feature/migrations] Revert unrelated changes to functions.php
  [ticket/9737] Fix some comments
  [ticket/9737] Fix a few minor things in migrations
  [feature/migrations] Make sure migration data not done before running data step
  [feature/migrations] Function to populate the migrations table (for install)
  [feature/migrations] Function effectively_installed() in migrations
  [feature/migrations] Make load_migrations recursive (optionally)
  [feature/migrations] Make the test depends_on methods static
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] install/database_update_migrations.php
  [feature/migrations] Move test.php -> install/database_update_migrations.php
  [feature/migrations] Store depends on in the database (serialized)
  [feature/migrations] Revert method completed
  [feature/migrations] Basic reverting test
  [feature/migrations] Test for calling a step multiple times
  [feature/migrations] Creating revert method to attempt reverting a migration
  [feature/migrations] Some comments in db_tools
  [feature/migrations] Reverse data functionality
  [feature/migrations] Comment
  ...

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
2013-02-06 12:25:13 -05:00
Nathan Guse
1e5a1b72dc Merge remote-tracking branch 'remotes/bantu/ticket/11201' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11201:
  [ticket/11201] Revert WLM dropping because it is still used in China.
2013-02-04 20:57:37 -06:00
Nathaniel Guse
77df9109b6 [feature/migrations] Remove default values from necessary parameters
Clean up some comments

PHPBB3-9737
2013-02-04 13:46:23 -06:00
Andreas Fischer
336187151a [ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Andreas Fischer
34c564062a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11220] Improvement to the info pop-up from "list="
2013-02-03 14:51:52 +01:00
Andreas Fischer
996f1abee3 Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympus
* Crizz0/ticket/11220:
  [ticket/11220] Improvement to the info pop-up from "list="
2013-02-03 14:51:39 +01:00
Crizz0
cf3edb2c6e [ticket/11220] Improvement to the info pop-up from "list="
A improvement to the info popup which is displayed when the cursor
is over the bbcode-button [list=] in the posting-editor

PHPBB3-11220
2013-02-03 13:24:00 +01:00
Andreas Fischer
01045a6bb0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:39 +01:00
Andreas Fischer
a0b141b673 Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympus
* dhruvgoel92/ticket/11233:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:20 +01:00
Nathaniel Guse
67c85fa4d3 Merge branch 'develop-olympus' into develop
# By Senky
# Via Nathaniel Guse (1) and Senky (1)
* develop-olympus:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition

Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
2013-01-30 16:56:16 -06:00
Nathaniel Guse
5154c6960d Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympus
# By Senky
# Via Senky
* remotes/Senky/ticket/10050:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition
2013-01-30 16:51:50 -06:00
Nathaniel Guse
75244eafd9 [feature/migrations] Revert unrelated changes to functions.php
PHPBB3-9737
2013-01-30 16:20:50 -06:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
2013-01-30 21:46:15 +05:30
Oleg Pudeyev
2df2f27b96 Merge PR branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:46:11 -05:00
Oleg Pudeyev
ba5d84ba1d Merge PR branch 'bantu/ticket/11343' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11343:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:45:55 -05:00
Oleg Pudeyev
a6aec47cb1 Merge PR branch 'bantu/ticket/11295' into develop
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11295:
  [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
2013-01-26 04:21:26 -05:00
Andreas Fischer
5a146df07f [ticket/11343] Remove spare parentheses.
PHPBB3-11343
2013-01-25 19:52:02 +01:00
Andreas Fischer
8421aa0b0e [ticket/11343] Remove spare space.
PHPBB3-11343
2013-01-25 19:51:17 +01:00