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

16058 commits

This branch
This branch
All branches
Author SHA1 Message Date
David King
826607a405 [feature/migrations] Add method and property visibility, use __construct() 
PHPBB3-9737
 2013-01-09 16:44:06 -06:00
David King
61debcf14c [feature/migrations] Update phpbb_db_migrator class for PHP 5.3.3 
PHPBB3-9737
 2013-01-09 16:44:06 -06:00
David King
ced035788b [feature/migrations] Update phpbb_db_migration class for PHP 5.3.3 
PHPBB3-9737
 2013-01-09 16:44:05 -06:00
Nathan Guse
6c44dadecb [feature/migrations] Move migrator to service container 
Version numbers

3.1 updates

Restore database_update.php file to what it was in develop

Get first forum to place global announcements in

PHPBB3-9737
 2013-01-09 16:44:05 -06:00
Nils Adermann
41de95bc11 [feature/migrations] Process migration steps and move to PHP5 code 2013-01-09 16:42:48 -06:00
Nathan Guse
82efb3e446 [feature/migrations] Remove references as it is now 3.1 code 
PHPBB3-9737
 2013-01-09 16:42:47 -06:00
Nils Adermann
91a921a96b [feature/migrations] Change migration data processing to run step by step 2013-01-09 16:42:47 -06:00
Nathan Guse
ce021710fb [feature/migrations] Rename classes, depends on 
PHPBB3-9737
 2013-01-09 16:42:46 -06:00
Nils Adermann
b52a0f50ab [feature/migrations] Update 3.0.3-3.0.5 migrations to work 2013-01-09 16:42:46 -06:00
Nathaniel Guse
167faed163 [feature/migrations] Depend on part2 
PHPBB3-9737
 2013-01-09 16:42:45 -06:00
Nathaniel Guse
ae8edf7b0e [feature/migrations] Use $this->db 
PHPBB3-9737
 2013-01-09 16:42:45 -06:00
Nathaniel Guse
2a7985c26f [feature/migrations] Migrations back through 3.0.6 
PHPBB3-9737
 2013-01-09 16:42:44 -06:00
Nathaniel Guse
e7389e4c32 [feature/migrations] 3.0.8-rc1 migration, fix some calls 
PHPBB3-9737
 2013-01-09 16:42:44 -06:00
Nathaniel Guse
b999a75528 [feature/migrations] Some migrations data 
PHPBB3-9737
 2013-01-09 16:42:43 -06:00
Nils Adermann
b1f9ca2f65 [feature/migrations] Moved database_update info to individual migration classes 2013-01-09 16:42:43 -06:00
Nils Adermann
c802f2a66c [feature/migrations] Standard vars for migrations and run sql with feedback 
PHPBB3-9737
 2013-01-09 16:40:00 -06:00
Nils Adermann
8645321f40 [feature/migrations] Return schema changes in database update style array 
Returning the set of schema changes allows potentially aggregating to generate
the overall install schema automatically from a set of migrations

PHPBB3-9737
 2013-01-09 16:40:00 -06:00
Nils Adermann
d304b6449d [feature/migrations] Store start and end time of migrations 
PHPBB3-9737
 2013-01-09 16:39:59 -06:00
Nils Adermann
f817e20f28 [feature/migrations] Basic migrations with schema and data changes 
The migrator takes care of applying migrations as necessary.

RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337

PHPBB3-9737
 2013-01-09 16:39:59 -06:00
Marc Alexander
7402add107 [feature/avatars] Add missing @var to docblocks in avatar manager 
PHPBB3-10018
 2013-01-09 15:50:15 +01:00
Oleg Pudeyev
0e9b7bcae9 Merge PR #1182 branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
 2013-01-09 01:25:54 -05:00
Oleg Pudeyev
8b4e661904 Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11301:
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
 2013-01-09 01:25:44 -05:00
Marc Alexander
fbdd3170c9 [ticket/11313] Use correct object el instead of eel in alt_text callback 
This typo was added by the PRs #860 and #1178. Only the object el exists
and is correct. Due to this the text of links using the alt_text callback
were not modified while executing the callback.

PHPBB3-11313
 2013-01-08 23:35:39 +01:00
Andreas Fischer
41a07eedeb [ticket/11301] Guidelines: Add spaces in front and after the / operator. 
PHPBB3-11301
 2013-01-08 23:20:30 +01:00
Andreas Fischer
24befac7b4 [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. 
PHPBB3-11301
 2013-01-08 23:18:17 +01:00
Marc Alexander
7ea0376958 [feature/avatars] Remove not needed inline style 
PHPBB3-10018
 2013-01-08 22:47:05 +01:00
Oleg Pudeyev
b96a2fce28 Merge PR #1178 branch 'marc1706/ticket/10949' into develop 
# By Marc Alexander (2) and Callum Macrae (1)
# Via Marc Alexander
* marc1706/ticket/10949:
  [ticket/10949] Remove not needed comma
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/10949] Converted AJAX coding standards to new guidelines.
 2013-01-08 16:36:35 -05:00
Marc Alexander
caa3516d13 [feature/avatars] Differentiate tests for get drivers functions 
Tests for get_all_drivers() and get_enabled_drivers() should be different.

PHPBB3-10018
 2013-01-08 21:58:03 +01:00
Marc Alexander
cb08bf3c0c [feature/avatars] Strictly check if avatar list is empty and cache result 
PHPBB3-10018
 2013-01-08 21:46:43 +01:00
Marc Alexander
9e001153d6 [feature/avatars] Pass phpbb_user object to prepare_form_acp() 
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.

PHPBB3-10018
 2013-01-08 15:42:30 +01:00
Marc Alexander
8778c9c945 [feature/avatars] Pass phpbb_user object to get_custom_html() 
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().

PHPBB3-10018
 2013-01-08 15:34:20 +01:00
Marc Alexander
023d7a972d [feature/avatars] Remove $request property and pass as argument if needed 
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().

PHPBB3-10018
 2013-01-07 23:02:07 +01:00
Marc Alexander
8867cb60b1 [feature/avatars] Use empty() instead of sizeof() 
PHPBB3-10018
 2013-01-07 21:16:39 +01:00
Marc Alexander
41710c745d [feature/avatars] Add function for localizing errors 
PHPBB3-10018
 2013-01-06 21:09:07 +01:00
Andreas Fischer
ef8cc04dc8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11292] Fix: Newlines removed in display of PM reports
 2013-01-06 02:12:25 +01:00
Andreas Fischer
c8dd12e5f4 Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympus 
* gn36/ticket/11292:
  [ticket/11292] Fix: Newlines removed in display of PM reports
 2013-01-06 02:11:10 +01:00
Andreas Fischer
b7bd657882 Merge remote-tracking branch 'marc1706/ticket/11311' into develop 
* marc1706/ticket/11311:
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
 2013-01-06 01:47:42 +01:00
Marc Alexander
111e02395c [feature/avatars] Add missing docblocks to avatar manager 
PHPBB3-10018
 2013-01-05 20:17:53 +01:00
Marc Alexander
4773eb3583 [ticket/11311] Include asset core.js in subsilver2 overall_footer.html 
Without the inclusion of core.js the timezone functions will not properly
work. They refer to phpbb which is defined in core.js.

PHPBB3-11311
 2013-01-05 11:42:58 +01:00
Marc Alexander
be77194435 [ticket/10949] Remove not needed comma 
This comma might actually cause issues in browser. Therefore remove it.

PHPBB3-10949
 2013-01-05 11:40:41 +01:00
Oleg Pudeyev
df5cba46d9 Merge PR #1177 branch 'erikfrerejean/ticket/11309' into develop 
# By Erik Frèrejean
# Via Erik Frèrejean
* erikfrerejean/ticket/11309:
  [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
 2013-01-04 18:52:08 -05:00
Erik Frèrejean
68baee4ce2 [ticket/11309] phpbb_extension_interface::disable_step correct docblock. 
The `@return` documentation of the `phpbb_extension_interface::disable_step`
method states incorrect that the method returns null, as it returns
false or a state.

PHPBB3-11309
 2013-01-04 23:59:34 +01:00
Marc Alexander
b5cc1ed683 [ticket/10949] Converted missing code to new JS coding guidelines 
A few missing semi-colons were also added where needed.

PHPBB3-10949
 2013-01-04 22:46:12 +01:00
Marc Alexander
46c33e08b5 Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949 
Conflicts:
	phpBB/assets/javascript/core.js
 2013-01-04 20:46:56 +01:00
Marc Alexander
a342e47038 [feature/avatars] Change avatar javascript to conform to new coding guidelines 
PHPBB3-10018
 2013-01-04 18:13:49 +01:00
Marc Alexander
8f8527a416 [feature/avatars] Improve handling of incorrect input for avatars 
The upload avatar driver will now inform the user if insufficient data has
been entered for both remote and local avatar uploads.
The local avatar driver (gallery avatar) will also inform the user if he
didn't select a category and/or file before submitting.

PHPBB3-10018
 2013-01-04 17:32:04 +01:00
Marc Alexander
7256a2d944 [feature/avatars] Add phpbb prefix to new functions 
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
 2013-01-04 15:10:43 +01:00
Marc Alexander
5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars 
Conflicts:
	phpBB/includes/ucp/ucp_groups.php
 2013-01-04 10:49:57 +01:00
Marc Alexander
4a8b1a6e05 [feature/avatars] Inform user of no available local avatars 
Rather than showing the user an empty drop-down list for the local avatar
categories, inform him/her that there are currently no (local) avatars
available.

PHPBB3-10018
 2013-01-04 10:25:08 +01:00
Andreas Fischer
228580b674 Merge remote-tracking branch 'erikfrerejean/ticket/11283' into develop 
* erikfrerejean/ticket/11283:
  [ticket/11283] Extension manager follow symlinks.
 2013-01-03 04:10:04 +01:00