mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 22:10:14 +02:00
Code Issues Releases Wiki Activity
13,629 Commits 18 Branches 192 Tags
Commit Graph

5785 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
f739d7acce [ticket/10752] Changing private to protected variables in acp_styles 
Changing private to protected variables in acp_styles

PHPBB3-10752
 2012-04-03 01:14:14 +03:00
Vjacheslav Trushkin
57065095d5 [ticket/10754] Changing $style to $phpbb_style 
Renaming global variable $style to $phpbb_style

PHPBB3-10754
 2012-04-03 00:41:56 +03:00
Vjacheslav Trushkin
a46b5480e1 [ticket/10752] More fixes for acp_styles 
Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes

PHPBB3-10752
 2012-04-03 00:19:16 +03:00
Vjacheslav Trushkin
e558a3cb05 [ticket/10752] Pass-by-reference fix for acp_styles 
Fixing pass-by-reference bug in acp_styles

PHPBB3-10752
 2012-04-03 00:18:52 +03:00
Vjacheslav Trushkin
7c99525b98 [ticket/10752] Removing globals acp_styles 
Removing global variables from functions in acp_styles

PHPBB3-10752
 2012-04-03 00:14:30 +03:00
Igor Wiedler
2c68dc2e6d Merge remote-tracking branch 'sadu/ticket/10438' into develop 
* sadu/ticket/10438:
  [ticket/10438] Alligning the Smileys on the same line as the text.
 2012-04-01 21:39:37 +02:00
Hari Sankar R
06d26ef46e [ticket/10438] Alligning the Smileys on the same line as the text. 
Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.

PHPBB3-10438
 2012-04-02 00:35:39 +05:30
Vjacheslav Trushkin
c89ea703bd [ticket/10665] Solution for T_SUPER_TEMPLATE_PATH 
Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete

PHPBB3-10665
 2012-04-01 20:46:10 +03:00
Vjacheslav Trushkin
1ffc7c1fab [ticket/10665] Changing template->_js_include to public 
Changing template->_js_include to public function

PHPBB3-10665
 2012-04-01 20:29:03 +03:00
Vjacheslav Trushkin
fb0df8d2e3 [ticket/10665] Moving filter parameters to one array 
Moving filter parameters to one array in template compiler class

PHPBB3-10665
 2012-04-01 20:19:07 +03:00
Vjacheslav Trushkin
b548389207 Merge remote-tracking branch 'upstream/develop' into ticket/10665 
* upstream/develop:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10731] Fixed addquote() to work on opera browser.
  [ticket/10731] Fixed addquote() to work on opera browser.
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
  [ticket/10675] Add disk full language string when posting attachments
 2012-04-01 19:28:37 +03:00
Igor Wiedler
2b3cfa0f7b Merge remote-tracking branch 'cyberalien/ticket/10733' into develop 
* cyberalien/ticket/10733:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10733] Adding test for locator
  [ticket/10733] Adding functions to locate resources
  [ticket/10733] Extending get_source_file_for_handle
 2012-04-01 18:22:55 +02:00
Vjacheslav Trushkin
a7d0ef90ea [ticket/10665] INCLUDEJS template tag 
Implementing INLCUDEJS template tag in style classes

PHPBB3-10665
 2012-04-01 10:58:24 +03:00
Vjacheslav Trushkin
f80512f106 [ticket/10733] Adding functions to locate resources 
Adding $style->locate() and $template->locate() functions

PHPBB3-10733
 2012-04-01 09:52:55 +03:00
Igor Wiedler
40c37fb867 Merge remote-tracking branch 'cyberalien/ticket/10735' into develop 
* cyberalien/ticket/10735:
  [ticket/10735] Changing locator paths structure
 2012-03-31 22:51:48 +02:00
Vjacheslav Trushkin
2ce73baeab [ticket/10733] Extending get_source_file_for_handle 
Extending resource locator's function get_source_file_for_handle to find all files. This modified function should be used by template events to locate all templates before compiling them.

PHPBB3-10733
 2012-03-31 22:07:04 +03:00
Vjacheslav Trushkin
b3f46b9565 [ticket/10735] Changing locator paths structure 
Changing locator paths to 2 dimensional array

PHPBB3-10735
 2012-03-31 21:20:18 +03:00
Igor Wiedler
1d4253319c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10675] Add disk full language string when posting attachments
 2012-03-31 19:29:56 +02:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus 
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
 2012-03-31 19:27:19 +02:00
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth 
PHPBB3-10609
 2012-03-31 18:14:11 +02:00
Igor Wiedler
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_* 
PHPBB-10609
 2012-03-31 18:14:07 +02:00
Igor Wiedler
5d07b16ec6 [feature/merging-style-components] Fix back link on install page 
When on install page and all styles are installed, fix back link to go to main
styles page.

PHPBB3-10632
 2012-03-31 18:20:49 +03:00
Vjacheslav Trushkin
17989c17a0 [feature/merging-style-components] Moving template initialization out of style 
Moving template initialization out of style constructor

PHPBB3-10632
 2012-03-31 18:10:00 +03:00
Vjacheslav Trushkin
0540509f14 [feature/merging-style-components] Renaming "delete" to "uninstall" for styles 
Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
 2012-03-31 17:58:17 +03:00
Vjacheslav Trushkin
360312f599 [feature/merging-style-components] Initializing locator and provider separately 
Moving locator and path provider initialization out of style class

PHPBB3-10632
 2012-03-31 17:38:30 +03:00
Vjacheslav Trushkin
9611997552 [feature/merging-style-components] Fixing few errors in acp_styles 
Fixing notices and usability issues

PHPBB3-10632
 2012-03-31 17:04:17 +03:00
Igor Wiedler
bc46cfd6e5 [feature/merging-style-components] Fix notices in acp_styles 
PHPBB3-10632
 2012-03-31 16:53:41 +03:00
Vjacheslav Trushkin
398a6c8045 Merge branch 'develop' into feature/merging-style-components 
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
 2012-03-31 10:43:06 +03:00
Igor Wiedler
41d8a777dc [feature/ajax] Add entirely unrelated but nice newlines 
PHPBB3-10270
 2012-03-31 02:10:18 +02:00
Igor Wiedler
4a5172c9f7 [feature/ajax] Unify phpbb_json_response instantiation 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Igor Wiedler
8138103c6b [feature/ajax] Send correct activate/deactivate JSON response in acp_profile 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Igor Wiedler
9b971c9fb1 [feature/ajax] Replace static call to phpbb_request with OO 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Callum Macrae
d8e21952fa [ticket/10273] Fixed accepting / denying posts AJAX. 
PHPBB3-10273
 2012-03-31 02:10:16 +02:00
Igor Wiedler
e73426fe26 [feature/ajax] Handle acp_modules error cases with JSON response 
PHPBB3-10270
 2012-03-31 02:10:15 +02:00
Callum Macrae
e5d0f2c6ad [ticket/10328] Fixed the header of json_response.php. 
PHPBB3-10328
 2012-03-31 02:09:21 +02:00
Callum Macrae
dbb81fbd2b [ticket/10328] Added capital to "Content-type" in phpbb_json_response. 
It was originally Content-type, but has been replaced with Content-Type,
which is correct.

PHPBB3-10328
 2012-03-31 02:09:16 +02:00
Callum Macrae
e7e09f8da2 [ticket/10272] AJAXified the bots page in the ACP. 
PHPBB3-10272
 2012-03-31 02:09:15 +02:00
Callum Macrae
4ae74cd4b4 [ticket/10271] AJAXified buttons on acp_main. 
PHPBB3-10271
 2012-03-31 02:09:15 +02:00
Callum Macrae
1cb3b595ec [ticket/10271] AJAXified the styles tab in the ACP. 
PHPBB3-10271
 2012-03-31 02:09:15 +02:00
Callum Macrae
11112314f7 [ticket/10271] AJAXified various deletions in the ACP. 
The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
 2012-03-31 02:09:15 +02:00
Callum Macrae
7a933bdb5a [ticket/10328] Renamed the JSON class, also now using autoloading. 
It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.

PHPBB3-10328
 2012-03-31 02:09:14 +02:00
Callum Macrae
082c5c5b32 [ticket/10272] Zebra operations using AJAX are now less hacky. 
Before, they were splitting stuff by the <br />, and now JSON::add() is
being used.

PHPBB3-10272
 2012-03-31 02:09:14 +02:00
Callum Macrae
dce38f44de [ticket/10328] Added a JSON class. 
The JSON class adds a consistent way to send JSON to the client, making
it perfect for AJAX (jQuery automatically parses it).

PHPBB3-10328
 2012-03-31 02:09:13 +02:00
Callum Macrae
94172b54dd [ticket/10271] Changed AJAX functions to $request->is_ajax(). 
PHPBB3-10271
 2012-03-31 02:09:13 +02:00
Callum Macrae
bb7a03f738 [ticket/10281] AJAXified reordering forums in the ACP. 
PHPBB3-10281
 2012-03-31 02:09:12 +02:00
Callum Macrae
d420ceb9c7 [ticket/10270] Added JavaScript popups and basic AJAX functionality to PHP. 
This commit adds the phpbb object (JavaScript), and alert and confirm box
methods. It also adds the first basic AJAX functionality, to deleting posts
in viewtopic.

PHPBB3-10270
 2012-03-31 02:00:22 +02:00
David King
4f97cc1295 Merge remote-tracking branch 'cyberalien/feature/purge-cache' into develop 2012-03-30 19:34:08 -04:00
David King
dc07617c19 Merge branch 'callumacrae/ticket/10510-' into develop 2012-03-30 18:28:18 -04:00
Igor Wiedler
0bd635f1b4 Merge pull request #662 from imkingdavid/ticket/10586 
[ticket/10586] Use an abstract class that implements the interface
 2012-03-30 10:59:46 -07:00
Igor Wiedler
951e2c8d0c [feature/event-dispatcher] Fix copyright years 
PHPBB3-9550
 2012-03-30 14:22:20 +02:00