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

13626 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Igor Wiedler
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_* 
PHPBB-10609
 2012-03-31 18:14:07 +02:00
Igor Wiedler
17a7b57074 Merge pull request #676 from cyberalien/feature/merging-style-components 
[feature/merging-style-components] Fixing typos in database updater
 2012-03-31 08:54:56 -07:00
Vjacheslav Trushkin
550ee7309a [feature/merging-style-components] Fixing typos in database updater 
Yes, I failed... again. Fixing 2 more typos in database_update.php

PHPBB3-10632
 2012-03-31 18:53:49 +03:00
Igor Wiedler
84775aaac5 Merge pull request #675 from cyberalien/feature/merging-style-components 
[feature/merging-style-components] Fixing typo in database updater
 2012-03-31 08:46:34 -07:00
Vjacheslav Trushkin
1be5bd8e13 [feature/merging-style-components] Fixing typo in database updater 
Fixing typo in database_update.php

PHPBB3-10632
 2012-03-31 18:38:37 +03:00
Igor Wiedler
0ae491c5fa Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop 
* cyberalien/feature/merging-style-components: (31 commits)
  [feature/merging-style-components] Fix back link on install page
  [feature/merging-style-components] Fix for unit tests
  [feature/merging-style-components] Moving template initialization out of style
  [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
  [feature/merging-style-components] Initializing locator and provider separately
  [feature/merging-style-components] Fixing few errors in acp_styles
  [feature/merging-style-components] Fix notices in acp_styles
  [feature/merging-style-components] Updating styles in coding guidelines
  [feature/merging-style-components] Changing acp_styles text
  [feature/merging-style-components] Updating test cases
  [feature/merging-style-components] Updating style initialization
  [feature/merging-style-components] Changing style class
  [feature/merging-style-components] Changing template class
  [feature/merging-style-components] Changing resource locator
  [feature/merging-style-components] Changing path provider
  [feature/merging-style-components] Renaming style locator
  [feature/merging-style-components] Changing $style to $style_id
  [feature/merging-style-components] Creating style class
  [feature/merging-style-components] New acp_styles template
  [feature/merging-style-components] New acp_styles
  ...
 2012-03-31 17:22:54 +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
377db78dca [feature/merging-style-components] Fix for unit tests 
Fixing typo in template unit tests

PHPBB3-10632
 2012-03-31 18:16:53 +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
e13e4d9206 [feature/merging-style-components] Updating styles in coding guidelines 
Updating styles section in coding guidelines

PHPBB3-10632
 2012-03-31 16:33:30 +03:00
Igor Wiedler
e7a4437c1b Merge pull request #673 from naderman/ticket/10736 
[ticket/10736] Run composer in phing builds
 2012-03-31 06:23:38 -07:00
Nils Adermann
fadeefe770 [ticket/10736] Run composer in phing builds 
PHPBB3-10736
 2012-03-31 15:18:49 +02:00
Igor Wiedler
49696789c9 Merge pull request #672 from unknownbliss/ticket/10736 
[ticket/10736] Changing travis so it installs composer.phar to phpBB/
 2012-03-31 04:34:40 -07:00