1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

12361 Commits

Author SHA1 Message Date
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Oleg Pudeyev
21639d5d54 Merge remote-tracking branch 'Fyorl/ticket/10607' into develop-olympus
* Fyorl/ticket/10607:
  [ticket/10607] Added 'Powered by' translation string.
2012-04-04 15:22:00 -04:00
Rahul R
08bee4c522 [ticket/10650]Added permission checking and utf8 functions
Passworded forums and ones in which user doesn't have
read access will be excluded. Also uft8 based string functions and
html encode/decode functions have been used to sanitise subject.

PHPBB3-10650
2012-04-05 00:46:23 +05:30
Rahul R
663b5f6542 [ticket/10650] Cropped subject and inserted newline
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
2012-04-05 00:46:14 +05:30
Rahul
1dd5b48434 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-05 00:46:01 +05:30
Rahul
01e6254ccc [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-05 00:45:50 +05:30
Rahul
fd409c49a5 [ticket/10650] Added static sql files
Ran create_schema_files.php and added
the generated static sql files to the commit.

PHPBB3-10650
2012-04-05 00:45:39 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Vjacheslav Trushkin
bb62804407 [ticket/10762] Check for phpbb_version when installing style
Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch.

PHPBB3-10762
2012-04-04 13:13:12 +03:00
Vjacheslav Trushkin
e769e0f723 [ticket/10762] Changing version format in style.cfg
Splitting version into style_version and phpbb_version in style.cfg

PHPBB3-10762
2012-04-04 13:07:24 +03:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Oleg Pudeyev
714fafe106 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
2012-04-03 20:57:31 -04:00
Oleg Pudeyev
14e727b834 Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus
* bantu/ticket/10658:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
2012-04-03 20:57:24 -04:00
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific.
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
2012-04-04 02:51:28 +08:00
Hari Sankar R
a84b97f58e [ticket/10561] Fixed syntax error and renamed return variables.
Renamed $style_verified to $style_is_active and fixed extra ';'.

PHPBB3-10561
2012-04-03 23:15:16 +05:30
Hari Sankar R
c5481371b9 [ticket/10561] Changes made to $db->sql_fetchrow().
Changed $db->sql_fetchrow() to $db->sql_fetchfield().

PHPBB3-10561
2012-04-03 23:04:56 +05:30
Hari Sankar R
b81a5afc25 [ticket/10561] Changes made to function phpbb_style_is_active().
Fixed return type, documented function and, removed
style_id from fetch.

PHPBB3-10561
2012-04-03 22:56:06 +05:30
Hari Sankar R
084e1ae560 [ticket/10561] All users can choose deactivated styles (fixed).
A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.

PHPBB3-10561
2012-04-03 22:15:59 +05:30
Vjacheslav Trushkin
e27326a57b [ticket/10752] Fixes for acp_styles
Adding form token, changing functions to public/protected, fixing few more errors

PHPBB3-10752
2012-04-03 14:26:38 +03:00
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
Vjacheslav Trushkin
8363d32765 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
2012-04-02 16:20:21 +03:00
Vjacheslav Trushkin
51bc9540cf Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus
* sadu/ticket/10699:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
2012-04-02 16:18:56 +03:00
Hari Sankar R
17e050e109 [ticket/10699] Long h2 title breaks div.minitabs in MCP
Fixed minor issues in formatting.

PHPBB3-10699
2012-04-02 16:59:05 +05:30
Shibu Lijack
d8c67937d6 [ticket/10734] Fixed cp css
Fixed border radius and padding of the ucp and mcp.

PHPBB-10734
2012-04-02 16:53:09 +05:30
Hari Sankar R
42101fe8d4 [ticket/10699] Long h2 title breaks div.minitabs in MCP
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
2012-04-02 16:26:23 +05:30
Shibu Lijack
3ced1d2bfc [ticket/10734] Removed all the unnecessary corner classes
Removed the corner span classes from all the template and theme files.

PHPBB-10734
2012-04-02 16:15:55 +05:30
Shibu Lijack
97ff7ee9d8 [ticket/10734] Fixed padding issues
Fixed padding for post and panel.

PHPBB-10734
2012-04-02 02:04:11 +05:30
Shibu Lijack
6498f2d33a [ticket/10734] Fixed IE7 clear float bug
Modified tweaks.css to fix IE bug

PHPBB-10734
2012-04-02 01:47:08 +05:30
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
Shibu Lijack
57ba42d8df [ticket/10734] Removed unwanted css elements
Removed all the corner css elements

PHPBB-10734
2012-04-02 00:49:31 +05:30
Vjacheslav Trushkin
24cd3a21a0 [ticket/10742] Fixing table widths
Fixing table widths for members list, team page, online users list

PHPBB3-10742
2012-04-01 22:16:53 +03:00
Shibu Lijack
03f5fde747 [ticket/10734] Removed unwanted span classes
Removed the corner and clear span classes

PHPBB-10734
2012-04-02 00:42:11 +05:30
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
Shibu Lijack
a728b08e90 [ticket/10734] Used pseudo class for clearing
Instead of using a separate class for clearing, pseudo :after class is
added.

PHPBB3-10734
2012-04-02 00:05:37 +05:30
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
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
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
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
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