1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

14284 Commits

Author SHA1 Message Date
Nathan Guse
b41b1a36d1 [ticket/11103] Case time in queries as an int
PHPBB3-11103
2013-02-28 15:25:18 -06:00
Nathan Guse
247ecdf11b [ticket/11103] Fix effectively installed check
PHPBB3-11103
2013-02-28 15:06:52 -06:00
Nathan Guse
11ca2c15d6 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
2013-02-28 10:27:16 -06:00
David King
1eead4da97 Merge remote-tracking branch 'EXreaction/ticket/11363' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363:
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11363] Load module info files for extensions too
2013-02-28 11:19:30 -05:00
David King
b1735e30bd Merge remote-tracking branch 'EXreaction/ticket/11372' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11372:
  [ticket/11372] Migrator should only check if effectively installed if not
2013-02-28 11:17:23 -05:00
Nathan Guse
e5417ec123 Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/11103
# By Matt Friedman
# Via Matt Friedman
* remotes/VSE/ticket/11103-VSEphpbb:
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11103] Add newlines to bottom of css file
  [ticket/11103] HTML encode double arrow character
  [ticket/11103] Update styling of UCP Notifications in subsilver2
  [ticket/11103] Update styling of UCP Notifications in prosilver
  [ticket/11103] Update styling of subsilver2 notification modal
  [ticket/11103] Update styling of prosilver notification modal
  [ticket/11103] Remove title attribute from notification link
2013-02-28 09:56:37 -06:00
Nathan Guse
f665a4b5cf Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11370] Effectively installed migrations not inserted into table
  [ticket/11369] Reverting migration throws error
2013-02-28 09:52:23 -06:00
David King
0808e08c0b Merge remote-tracking branch 'EXreaction/ticket/11370' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11370:
  [ticket/11370] Effectively installed migrations not inserted into table
2013-02-28 10:44:49 -05:00
Matt Friedman
18d85bfc11 [ticket/11103] Remove padding from notifications for now.
PHPBB3-11103
2013-02-27 20:18:41 -08:00
Nathaniel Guse
c3434dec40 [ticket/11363] Fix a couple bugs and throw errors if the file not found
PHPBB3-11363
2013-02-27 14:09:27 -06:00
Nathaniel Guse
9b554fbf3c [ticket/11372] Migrator should only check if effectively installed if not
installed at all

PHPBB3-11372
2013-02-27 13:52:45 -06:00
Nathaniel Guse
d296e809d5 [ticket/11363] Load module info files for extensions too
Use the acp_modules::get_module_infos function instead of our own include code

PHPBB3-11363
2013-02-27 11:12:18 -06:00
Nathaniel Guse
c6aabab039 [ticket/11103] Notifications Migration file
PHPBB3-11103
2013-02-26 19:54:47 -06:00
Nathaniel Guse
51651b3d9f [ticket/11370] Effectively installed migrations not inserted into table
insert_migration() function now handles inserting/updating

Move all insert/update code to insert_migration() function to prevent this from occurring again.

PHPBB3-11370
2013-02-26 19:44:03 -06:00
Nathaniel Guse
f9cbf5b4c7 [ticket/11369] Reverting migration throws error
String is attempted to be unserialized

PHPBB3-11369
2013-02-26 19:25:51 -06:00
Nathaniel Guse
a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
2013-02-26 15:32:27 -06:00
David King
80bd78a5e5 Merge remote-tracking branch 'EXreaction/ticket/11367' into develop
# By Nathan Guse (1) and Nathaniel Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11367:
  [ticket/11367] Always freeresult
  [ticket/11367] Migrator throws error if migrations table does not exist
2013-02-26 15:46:08 -05:00
David King
82b20cc257 Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop
# By Nathan Guse (14) and Nathaniel Guse (4)
# Via Nathaniel Guse
* EXreaction/feature/migrations-data:
  [feature/migrations] Inject migrator rather than the container.
  [feature/migrations] Use the user class for language handling
  [feature/migrations] Fully revert the removal of the user_msnm field
  [feature/migrations] Revert unrelated change to schema_data.sql
  [feature/migrations] Remove user_msnm migration
  [feature/migrations] Correct depends_on
  [feature/migrations] Subdirectories for migration data
  [feature/migrations] Reports table schema changes in recent develop
  [feature/migrations] Automatically populate migrations table on install
  [feature/migrations] effectively installed check for migration data
  [feature/migrations] Comments for the return in the custom functions
  [feature/migrations] Order the migrations schema in schema_data.sql
  [feature/migrations] Fix migrations installer, schema for schema_data.sql
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] Remove hardcoded language, use lang instead.
  [feature/migrations] Revert schema for migration data
  [feature/migrations] Replace database_update.php with migrations updater
  [feature/migrations] Rebuilding migrations data on develop
2013-02-26 14:20:12 -05:00
Nathan Guse
9a319fefb2 [ticket/11367] Always freeresult
PHPBB3-11367
2013-02-26 10:22:13 -06:00
Nathaniel Guse
6045aa7aa2 [ticket/11367] Migrator throws error if migrations table does not exist
Force load_migration_state to not throw errors if the table does not exist.

PHPBB3-11367
2013-02-25 19:16:29 -06:00
Nathaniel Guse
9b38c4579e Merge remote-tracking branch 'remotes/marc/ticket/11342' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11342:
  [ticket/11342] Fix "unexpected token" syntax error
  [ticket/11342] Mark active topics read when marking forums read
2013-02-25 13:17:27 -06:00
Nathaniel Guse
e632049e19 Merge branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into feature/migrations-data
# By Dhruv (19) and others
# Via Nathaniel Guse (3) and others
* 'feature/migrations-data' of github.com:EXreaction/phpbb3: (38 commits)
  [feature/migrations] Use the user class for language handling
  [feature/migrations] Fully revert the removal of the user_msnm field
  [feature/migrations] Revert unrelated change to schema_data.sql
  [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
  [ticket/11359] html escape sphinx config data
  ...
2013-02-25 13:12:57 -06:00
Nathaniel Guse
7a8ae49300 [feature/migrations] Inject migrator rather than the container.
Some docblocks

PHBB3-9737
2013-02-25 13:12:32 -06:00
Andreas Fischer
558ecdcd40 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
2013-02-24 20:55:01 +01:00
Nils Adermann
4615698807 [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
Rather than send invalid message ids with a missing domain part we try
to read one from $_SERVER and otherwise use phpbb.generated

PHPBB3-10986
2013-02-24 19:07:24 +01:00
Nils Adermann
465ab7ab92 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
2013-02-24 18:17:42 +01:00
erangamapa
1b39d6d65e [ticket/11358] Changed the name of post parameter.
Replaced the parameter name 'defaultbylink' to a meaningful name
'set_default_on_all'. Parameter is used for making all users
default for selected group in acp_groups.php.

PHPBB3-11358
2013-02-24 18:12:50 +01:00
erangamapa
c0a39537e3 [ticket/11358] Changed the action parameter value to represent the link.
Changed the action parameter value to recognize whether 'Make default
group for every member' is clicked. If so execute a seperate code block
under switch statement for $action and add all the users as default
for the group.

PHPBB3-11358
2013-02-24 18:12:45 +01:00
erangamapa
538b09ba61 [ticket/11358] Enabled link making all users default for a group.
Detect whether link is clicked or form is posted for making users
default for a group. If form is posted and no users are selected,
validation happens and displays an error message. When the link is
clicked, all the users will be default users for that group.

PHPBB3-11358
2013-02-24 18:12:40 +01:00
erangamapa
880786d686 [ticket/11358] Removed redundant code and referred proper variable.
Error was thrown when no users are selected before executing the code
chunk which manually adds all the user to make the group default.
Removed this code and referred $mark_ary instead of $name_ary which
will not have selected user ids.

PHPBB3-11358
2013-02-24 18:12:35 +01:00
erangamapa
373c9a3f4e [ticket/11358] Success message even without selecting a user.
In group membership management, if you perform the action
'Make group default for member' without selecting any user,
a confirm box will be displayed and will show a success
message after confirming. Added a new condition to fix this
issue in acp_groups.php. It will check weather any users are
selected before performing above action.

PHPBB3-11358
2013-02-24 18:12:28 +01:00
Nils Adermann
b964d17564 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.

Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-02-24 18:07:29 +01:00
erangamapa
ab530a999e [ticket/11355] Referred proper variable when validating selection.
Earlier PR was referring wrong variable $name_ary. Changed it to
$mark_ary which actually contains selected user ids.

PHPBB3-11355
2013-02-24 18:04:54 +01:00
erangamapa
f8e184c54e [ticket/11355] Wrong error message when no user is selected.
In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.

PHPBB3-11355
2013-02-24 18:04:46 +01:00
Nils Adermann
e2046444a1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.

Conflicts:
	phpBB/includes/session.php
2013-02-24 17:58:27 +01:00
Nils Adermann
639110766c Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympus
* github-bantu/ticket/11361:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
2013-02-24 17:50:04 +01:00
Nils Adermann
d2a15d9afe [ticket/10896] Add missing email validation lost in develop merge
Fix incomplete merge, by adding a piece of code moved to another file in
olympus back.

PHPBB3-10896
2013-02-24 17:42:53 +01:00
Nils Adermann
5361a14c1e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
	phpBB/language/en/ucp.php
2013-02-24 17:42:14 +01:00
Nils Adermann
678ec7b545 Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-olympus
* github-exreaction/ticket/10896:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP
2013-02-24 17:39:04 +01:00
Nils Adermann
0fdbdd01fb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
2013-02-24 17:37:38 +01:00
Nils Adermann
f29bebc7ce Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympus
* github-bantu/ticket/11122:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
2013-02-24 17:37:32 +01:00
Nils Adermann
54f34dd26f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.

Conflicts:
	phpBB/includes/functions.php
2013-02-24 17:33:41 +01:00
Andreas Fischer
6bf64d5620 [ticket/7262] Add note about set_config() not updating is_dynamic.
PHPBB3-7262
2013-02-24 13:39:48 +01:00
Andreas Fischer
a9037a68c1 [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
The logic is the other way around here in comparison to develop's
phpbb_config_db class, so add examples to make things more clear.

PHPBB3-7262
2013-02-24 13:08:00 +01:00
Andreas Fischer
e8b3e8498d [ticket/7262] Backport set_config() and set_config_count() docs from develop.
PHPBB3-7262
2013-02-24 13:07:37 +01:00
Andreas Fischer
c69b1c2ef2 [ticket/11122] Move rxu to 'Former Contributors' section.
PHPBB3-11122
2013-02-24 12:43:31 +01:00
Andreas Fischer
c4f8c64a23 [ticket/11122] Add EXreaction to docs/AUTHORS.
PHPBB3-11122
2013-02-24 12:37:02 +01:00
Nathaniel Guse
f6a894f077 [feature/migrations] Use the user class for language handling
Also localise error messages from the migrator

PHBB3-9737
2013-02-23 16:12:24 -06:00
Nathaniel Guse
4bf64b5e38 [feature/migrations] Fully revert the removal of the user_msnm field
PHBB3-9737
2013-02-23 15:10:21 -06:00
Nathaniel Guse
c31935abda [feature/migrations] Revert unrelated change to schema_data.sql
PHBB3-9737
2013-02-23 15:08:28 -06:00