1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

14653 Commits

Author SHA1 Message Date
Matt Friedman
216dc82486 [ticket/11103] Remove title attribute from notification link
PHPBB3-11103
2013-02-14 10:55:30 -08:00
Nathaniel Guse
283ef6eed4 [ticket/11103] Mark/Unmark All buttons
PHPBB3-11103
2013-02-13 17:20:25 -06:00
Nathaniel Guse
dc9cfcd613 [ticket/11103] Make the number of notifications strong if > 0
PHPBB3-11103
2013-02-13 13:30:05 -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
Dhruv
1994fadb6f [ticket/11303] use S_TZ_PRESELECT in subsilver
PHPBB3-11303
2013-02-12 11:25:54 +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
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
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
d30a9cb497 [feature/migrations] Automatically populate migrations table on install
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
Nathan Guse
dd327ac83e [feature/migrations] Order the migrations schema in schema_data.sql
PHPBB3-11318
2013-02-06 11:35:54 -06:00
Nathan Guse
8baceacc36 [feature/migrations] Fix migrations installer, schema for schema_data.sql
PHPBB3-11318
2013-02-06 11:35:53 -06:00
Nathan Guse
74f4397451 [feature/migrations] Make depends_on static to call it without dependencies
Move installing migrations to migration/install.php and handle figuring
out what migrations have been installed based on phpBB version.

PHPBB3-11318
2013-02-06 11:35:53 -06:00
Nathan Guse
babdb92aa9 [feature/migrations] Remove hardcoded language, use lang instead.
PHPBB3-9737
2013-02-06 11:35:53 -06:00
Nathan Guse
ca55f6c481 [feature/migrations] Revert schema for migration data
PHPBB3-9737
2013-02-06 11:35:52 -06:00
Nathan Guse
bb99a2609d [feature/migrations] Replace database_update.php with migrations updater
PHPBB3-9737
2013-02-06 11:35:52 -06:00
Nathan Guse
fb4f7470d4 [feature/migrations] Rebuilding migrations data on develop
So this is easy to merge later.

PHPBB3-9737
2013-02-06 11:34:11 -06:00
Nathan Guse
aa67fa6dd8 [feature/migrations] Automatically install/revert migrations for extensions
Migrations from ext/ext_name/migrations/ are automatically installed
when enabling the extension and automatically reverted when the
extension is purged.

PHPBB3-11318
2013-02-06 11:31:50 -06:00
Nathan Guse
8d3a82a4fa [feature/migrations] Make the container available to extension installers
This allows extensions to load and install migrations easily as per their
needs.

PHPBB3-11318
2013-02-06 11:31:49 -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
5aec7600a6 [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
PHPBB3-10896
2013-02-04 23:13:47 -06:00
David Tobin
293b65e3ef [ticket/10896] Adds email validation to email settings in ACP
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.

PHPBB3-10896
2013-02-04 23:10:10 -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
Marc Alexander
11aff559d4 [feature/avatars] Use deprecated for compatibility function
Also moved use of global variables inside the only if statement they are
used in.

PHPBB3-10018
2013-02-03 23:06:30 +01:00
Marc Alexander
f322f4eac9 [feature/avatars] Correct license, copyright and package info
PHPBB3-10018
2013-02-03 23:02:35 +01:00
Marc Alexander
a54128b3bc [ticket/11342] Mark active topics read when marking forums read
Marking forums read while viewing a category will also mark the active
topics inside that category read. Therefore, the active topics should also
be marked read. With this patch the ajax callback "mark_forums_read" will
check if the active topics id ("active_topics") exists and also mark
topics read if it does. As the active topics will only be displayed in
categories, which can't have any other topics, this is a proper approach.

PHPBB3-11342
2013-02-03 15:51:29 +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