1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

15925 Commits

Author SHA1 Message Date
Nathaniel Guse
941b7287b7 Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [feature/avatars] Use "Main" as category for avatars in root of gallery
  [feature/avatars] Remove trailing whitespace from avatar code
  [feature/avatars] Pass phpbb_user to prepare and process form functions
  [feature/avatars] Document the use of the allowed extensions array
  [feature/avatars] Use array for allowed extensions and implode if needed
  [feature/avatars] Use deprecated for compatibility function
  [feature/avatars] Correct license, copyright and package info
  [feature/avatars] Move list of supported formats to avatar driver class
  [feature/avatars] Add include of functions_display.php in BC function
  [feature/avatars] Add note about when compatibility function was added
  [feature/avatars] Add compatibility function for get_user_avatar()
  [feature/avatars] Move definition of driver_collection to avatars.yml
  [feature/avatars] Remove the obsolete request argument for avatar drivers
  [feature/avatars] Add missing @var to docblocks in avatar manager
  [feature/avatars] Remove not needed inline style
  [feature/avatars] Differentiate tests for get drivers functions
  ...
2013-03-04 13:33:42 -06:00
Nathaniel Guse
029f096411 Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10411-2: (33 commits)
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  [ticket/10411] Add maxlength to category name input field
  [ticket/10411] Test for thrown exceptions when group does not exist
  [ticket/10411] Catch exceptions from grouppositions
  [ticket/10411] Throw exceptions instead of using trigger_error()
  [ticket/10411] Add return values to add/delete function
  [ticket/10411] Add return value to move functions
  [ticket/10411] Fix typehinting and change private to protected
  [ticket/10411] Use template loops instead of defining the html in php files
  [ticket/10411] Ensure we only get services that do exist
  [ticket/10411] Add a comment why we left join the group table
  [ticket/10411] Rename template variable CUR_ to CURRENT_
  [ticket/10411] Move globals to the top and use array for cache destroy
  [ticket/10411] Use new ajax callback name row_up/row_down
  [ticket/10411] Fix logic error when editing/creating a group
  ...
2013-03-04 13:25:53 -06:00
Andreas Fischer
5695097b8a Merge remote-tracking branch 'EXreaction/ticket/11396' into develop
* EXreaction/ticket/11396:
  [ticket/11396] Rename insert_migration to set_migration_state
2013-03-04 18:52:50 +01:00
Marc Alexander
2e2ddd7e85 [feature/avatars] Update module_auth of ucp module and fix small issues
Reduced the check effectively_installed() to just checking for the config
entry "allow_avatar_gravatar". Also added the missing update of the
module_auth of the ucp_profile avatar mode.

PHPBB3-10018
2013-03-04 10:30:49 +01:00
Nathaniel Guse
ae15fabb32 [ticket/11396] Rename insert_migration to set_migration_state
PHPBB3-11396
2013-03-03 20:59:21 -06:00
Marc Alexander
c7ca4e445c [feature/avatars] Add migrations data file for avatars
The module_auth of the ucp avatar settings are used for checking if the
migration has already been installed.

PHPBB3-10018
2013-03-04 01:04:36 +01:00
Marc Alexander
e1bb76eb09 [feature/avatars] Reduce module auth of ucp avatar settings
Previously the avatar types that need to be enabled were hardcoded into
the module auth. This is no longer needed in the new avatar system.

PHPBB3-10018
2013-03-04 00:25:38 +01:00
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2013-03-04 00:22:15 +01:00
Nathaniel Guse
bee4f8d818 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Marc Alexander
# Via Marc Alexander (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:50:31 -06:00
Nathaniel Guse
fb371d6bbe Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/6723:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:48:56 -06:00
Nathaniel Guse
e33c8e2bb6 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11368] Fix background color for PM report rows by using accessing var.
2013-03-02 17:45:18 -06:00
Nathaniel Guse
d5617f046c Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11368:
  [ticket/11368] Fix background color for PM report rows by using accessing var.
2013-03-02 17:43:49 -06:00
Marc Alexander
acabe6f5ca [ticket/6723] Show info that message has been deleted before delivery
If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.

PHPBB3-6723
2013-03-03 00:32:31 +01:00
David King
e08edd36b9 Merge remote-tracking branch 'EXreaction/ticket/11386' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
2013-03-02 17:12:43 -05:00
Nathaniel Guse
9fca8f88fa Merge branch 'ticket/11385' into develop
# By OpenShift guest
* ticket/11385:
  [ticket/11385] Fix issue with migration module tool not getting extension module info
2013-03-02 15:44:16 -06:00
OpenShift guest
c73f0a7c78 [ticket/11385] Fix issue with migration module tool not getting extension module info
PHPBB3-11385
2013-03-02 15:43:42 -06:00
Nathaniel Guse
91be998223 [ticket/11386] Fix failing tests from constructor changes
PHPBB3-11386
2013-03-02 15:18:07 -06:00
Nathaniel Guse
59638a6a7d Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386
Conflicts:
	phpBB/includes/extension/finder.php
2013-03-02 14:48:44 -06:00
Nathaniel Guse
a6f877c0d8 [ticket/11386] Fix circular reference error & serialize error
PHPBB3-11386
2013-03-02 14:15:59 -06:00
Nathaniel Guse
024c21f30d [ticket/11386] Remove tests that check if finder cache is working
These don't seem necessary and are much more complicated to get
working now with the changes in this PR

PHPBB3-11386
2013-03-02 13:47:41 -06:00
Nathaniel Guse
1368470f74 [ticket/11386] Forgot to get the migration classes
PHPBB3-11386
2013-03-02 11:42:30 -06:00
Nathaniel Guse
8415ae839c [ticket/11386] Update tests with new constructors for ext.manager/migrator
PHPBB3-11386
2013-03-02 11:37:58 -06:00
Nathaniel Guse
39ca212e17 [ticket/11386] Use finder to find migration files
PHPBB3-11386
2013-03-02 11:12:12 -06:00
David King
4670ffe90c Merge remote-tracking branch 'EXreaction/ticket/11363-2' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363-2:
  [ticket/11363] Fix to make get_module_infos get from all extensions
2013-03-01 15:02:20 -05:00
David King
eb7c8592d9 Merge remote-tracking branch 'EXreaction/ticket/11381' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11381:
  [ticket/11381] Make finder able to search in all available extensions
2013-03-01 15:01:18 -05:00
Nathaniel Guse
e483e3f459 [ticket/11363] Fix to make get_module_infos get from all extensions
Depends on 11381

PHPBB3-11363
2013-03-01 12:05:08 -06:00
Nathaniel Guse
e34f6a5269 [ticket/11381] Make finder able to search in all available extensions
PHPBB3-11381
2013-03-01 11:37:24 -06:00
Joas Schilling
19c3917de9 [ticket/10411] Fix call to function on non-object $db->...()
PHPBB3-10411
2013-03-01 12:46:55 +01:00
Joas Schilling
b8b2ede35d [ticket/10411] Remove ajax delete, so the page is refreshed
Otherwise if you delete a group, you can not readd it to the page.

PHPBB3-10411
2013-03-01 12:45:49 +01:00
David King
8200509c79 Merge remote-tracking branch 'EXreaction/ticket/11103' into develop
# By Nathan Guse (169) and others
# Via Nathan Guse (29) and Nathaniel Guse (7)
* EXreaction/ticket/11103: (217 commits)
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11103] Notifications Migration file
  [ticket/11103] Restore new/unread messages info/link in header (properly)
  [ticket/11103] Add newlines to bottom of css file
  [ticket/11103] HTML encode double arrow character
  [ticket/11103] Add Notification Settings link in flyout menu
  [ticket/11103] Restore new/unread messages info/link in header
  [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
  [ticket/11103] Mark/Unmark All buttons
  [ticket/11103] Make the number of notifications strong if > 0
  [ticket/11103] Rounded Corners and antialiased pointer
  ...
2013-02-28 18:53:23 -05:00
Nathan Guse
ecb9f44bf1 [ticket/11103] Revert whitespace changes
PHPBB3-11103
2013-02-28 17:50:24 -06:00
Nathan Guse
db5a05418d [ticket/11103] Few more minor language things
PHPBB3-11103
2013-02-28 17:48:46 -06:00
Nathan Guse
ee264e7235 [ticket/11103] Don't call generate_board_url many times
Fix a URL and some comments

PHPBB3-11103
2013-02-28 17:25:39 -06:00
Marc Alexander
8a9e1ca3f1 [feature/avatars] Auto-clear avatar dimensions when first changing avatars
In the remote avatar and gravatar the dimension input boxes will now be
cleared when changing the avatar. This will only happen once per
page-load. Any input after the first change will not trigger this.

PHPBB3-10018
2013-02-28 22:56:01 +01:00
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
David King
e20da8fb81 Merge remote-tracking branch 'EXreaction/ticket/11369' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11369:
  [ticket/11369] Reverting migration throws error
2013-02-28 10:42:18 -05:00
Matt Friedman
18d85bfc11 [ticket/11103] Remove padding from notifications for now.
PHPBB3-11103
2013-02-27 20:18:41 -08:00
Joas Schilling
97a446f5b9 [ticket/10411] Update schema file with new table and remove the column
PHPBB3-10411
2013-02-27 22:00:15 +01:00
Joas Schilling
8bf04563bc [ticket/10411] Add unit tests for move() with values >1
PHPBB3-10411
2013-02-27 21:43:07 +01: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
Joas Schilling
3362baca51 [ticket/10411] Add migrations file for teampage table
PHPBB3-10411
2013-02-27 19:27:30 +01: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