makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 18:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
14612 commits 18 branches 192 tags 207 MiB
Commit graph

14612 commits

This branch
This branch
All branches
Author SHA1 Message Date
rxu
bf0a3ddaca Merge pull request #670 from imkingdavid/feature/qrpreview 
[feature/qrpreview] Preview from Quick Reply
 2012-04-01 11:28:47 -07:00
Igor Wiedler
9a075e905d Merge remote-tracking branch 'cyberalien/ticket/10665' into develop 
* cyberalien/ticket/10665:
  [ticket/10665] Adding includejs to acp templates
  [ticket/10665] Solution for T_SUPER_TEMPLATE_PATH
  [ticket/10665] New test class for templates with tree
  [ticket/10665] Changing template->_js_include to public
  [ticket/10665] Moving filter parameters to one array
  [ticket/10665] INCLUDEJS unit test
  [ticket/10665] Changing template compiler test
  [ticket/10665] INCLUDEJS template changes
  [ticket/10665] INCLUDEJS template tag
 2012-04-01 19:52:44 +02:00
Igor Wiedler
813e52a03a Merge branch 'develop' of github.com:phpbb/phpbb3 into develop 
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/10740] Revert margin-left changes of previous commit
 2012-04-01 19:52:43 +02:00
Vjacheslav Trushkin
37480e5594 [ticket/10665] Adding includejs to acp templates 
Adding includejs to acp overall_footer.html

PHPBB3-10665
 2012-04-01 20:50:59 +03:00
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
2d9d8d3673 [ticket/10665] New test class for templates with tree 
New parent template test class for tests that use styles tree

PHPBB3-10665
 2012-04-01 20:37:45 +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
32c680d8b8 Merge remote-tracking branch 'igorw/ticket/10740' into develop 
* igorw/ticket/10740:
  [ticket/10740] Revert margin-left changes of previous commit
  [ticket/10740] Changed styling of phpbb_alert box, to be centered.
 2012-04-01 19:47:45 +03:00
Igor Wiedler
f36a6f0ae3 [ticket/10740] Revert margin-left changes of previous commit 
PHPBB3-10740
 2012-04-01 18:44:05 +02: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
e68787c4ec Merge remote-tracking branch 'sadu/ticket/10740' into develop 
* sadu/ticket/10740:
  [ticket/10740] Changed styling of phpbb_alert box, to be centered.
 2012-04-01 18:26:54 +02: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
eaba2ed9ca [ticket/10733] Fixing test 
Changing expected and result in locator test

PHPBB3-10733
 2012-04-01 19:20:42 +03:00
Vjacheslav Trushkin
f5bac7686b [ticket/10733] Removing static from data providers 
Removing static from data provider functions

PHPBB3-10733
 2012-04-01 19:14:53 +03:00
Vjacheslav Trushkin
31dbe94f86 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10731] Fixed addquote() to work on opera browser.
 2012-04-01 17:05:46 +03:00
Hari Sankar R
b1b530f92c [ticket/10731] Fixed addquote() to work on opera browser. 
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
 2012-04-01 17:05:31 +03:00
Hari Sankar R
48616c7cf2 [ticket/10740] Changed styling of phpbb_alert box, to be centered. 
Changed the styling of the phpbb.alert() and phpbb.confirm()
dialogue boxes to me more centered on a page.

PHPBB3-10740
 2012-04-01 18:33:18 +05:30
Hari Sankar R
e7cf4bfb2e [ticket/10731] Fixed addquote() to work on opera browser. 
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
 2012-04-01 18:25:50 +05:30
Vjacheslav Trushkin
4b2ede433e [ticket/10665] INCLUDEJS unit test 
Adding INLCUDEJS test

PHPBB3-10665
 2012-04-01 11:17:13 +03:00
Vjacheslav Trushkin
38c988fb59 [ticket/10665] Changing template compiler test 
Adding new constructor parameters to template compiler test

PHPBB3-10665
 2012-04-01 11:16:57 +03:00
Vjacheslav Trushkin
2225efc560 [ticket/10665] INCLUDEJS template changes 
Implementing INLCUDEJS template tag in styles

PHPBB3-10665
 2012-04-01 10:58:59 +03: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
2509853ca5 [ticket/10733] Adding test for locator 
Adding test for $template->locate

PHPBB3-10733
 2012-04-01 09:53:23 +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
e78fbfef9c [feature/dic] Move cron.lock_db into DIC 
PHPBB3-10739
 2012-04-01 01:13:19 +02:00
Igor Wiedler
35c78c127b [feature/dic] Make table_config a DIC parameter 
PHPBB3-10739
 2012-04-01 01:01:32 +02: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
David King
5ccd6915e3 [feature/qrpreview] Do not error or show preview if no text is entered 
PHPBB3-10726
 2012-03-31 15:52:16 -04:00
Igor Wiedler
dc9ccc432c [feature/dic] Make use of calls to cut down on boilerplate 
PHPBB3-10739
 2012-03-31 21:20:58 +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
Igor Wiedler
a7f61b91b7 [feature/dic] Use DIC in download/file and install/index 
PHPBB3-10739
 2012-03-31 20:45:58 +02:00
Igor Wiedler
873630f04e [feature/dic] Move class loader into DIC 
PHPBB3-10739
 2012-03-31 20:45:33 +02:00
Igor Wiedler
bca600877c [feature/dic] Move cron manager into DIC 
PHPBB3-10739
 2012-03-31 20:27:46 +02:00
Igor Wiedler
776160a7e3 [feature/dic] Fetch cache driver explicitly 
PHPBB3-10739
 2012-03-31 20:23:33 +02:00
Igor Wiedler
b12f9a2855 [feature/dic] Remove cache factory, now handled by DIC 
PHPBB3-10739
 2012-03-31 20:21:26 +02: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
David King
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04: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
8e2cbe39cd [feature/dic] Convert common.php to Symfony2 DependencyInjection component 
PHPBB3-10739
 2012-03-31 19:25:01 +02:00
Shibu Lijack
33a10f57f9 [ticket/10734] Removed unwanted CSS hacks 
Removed -webkit and -moz as suggested by cyberalien.
Removed unused style elements.

PHPBB-10734
 2012-03-31 22:30:00 +05:30
Shibu Lijack
05cbecb558 [ticket/10734] Removed unnecessary images 
Deleted the corner_left and corner_right images.

PHPBB-10734
 2012-03-31 22:30:00 +05:30
Shibu Lijack
d0e0f3e72b [ticket/10734] Fixed common.css 
Fixed padding.

PHPBB3-10734
 2012-03-31 22:30:00 +05:30
Shibu Lijack
259b86199b [ticket/10734] Fixed template files 
Removed unnecessary span from several other template files

PHPBB3-10734
 2012-03-31 22:30:00 +05:30
Shibu Lijack
609e8e3b11 [ticket/10734] Fixed template files 
Removed unnecessary span from overall_header, overall_footer,
forumlist_body, viewforum_body.

PHPBB3-10734
 2012-03-31 22:30:00 +05:30
Shibu Lijack
31ea2da5ac [ticket/10734] CSS tweaks 
Modified colours.css
Removed the corner images.
Added border radius.

PHPBB3-10734
 2012-03-31 22:28:50 +05:30
Richard Foote
b8b342be2d [Ticket/10675] Correct language string ATTACH_DISK_FULL 
Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
 2012-03-31 12:46:44 -04:00
Nils Adermann
7e2f16aafa Merge remote-tracking branch 'github-igorw/feature/class-prefix' into develop 
* github-igorw/feature/class-prefix:
  [feature/class-prefix] Rename auth => phpbb_auth
  [feature/class-prefix] Rename user and session to phpbb_*
 2012-03-31 18:16:55 +02:00
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth 
PHPBB3-10609
 2012-03-31 18:14:11 +02:00