1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

2285 Commits

Author SHA1 Message Date
Joseph Warner
6a45cd7bca [feature/oauth] Login_link register form
PHPBB3-11673
2013-07-30 14:31:09 -04:00
Oliver Schramm
95c603d545 [ticket/8228] Fix still existing problems with code in firefox
A user of a board mentioned that there are still some problems
in firefox if php-highlighting is on. So I used a snippet which
they worked on for weeks. Link to the snippet (in german):
http://www.ongray-design.de/forum/viewtopic.php?t=541

PHPBB3-8228
2013-07-30 18:00:47 +02:00
Vjacheslav Trushkin
c335edc038 [ticket/11754] Remove styleswitcher leftovers
PHPBB3-11754
2013-07-30 12:21:34 +03:00
Joseph Warner
bcdeafedd7 [feature/oauth] Login works on login_link now, still does not actually link
PHPBB3-11673
2013-07-29 12:56:25 -04:00
Joseph Warner
75206c74be [feature/oauth] Basic checking for data needed in login linking
PHPBB3-11673
2013-07-29 11:58:47 -04:00
Matt Friedman
8e636e4572 [ticket/11749] Template events for topic_list_row_pre/append
PHPBB3-11749
2013-07-27 10:48:40 -07:00
Matt Friedman
dacca5657a [ticket/11747] Use _prepend and _append for template events
PHPBB3-11747
2013-07-26 22:25:27 -07:00
Matt Friedman
442b2a292e [ticket/11747] ucp_prefs_post template events
PHPBB3-11747
2013-07-26 18:33:54 -07:00
Matt Friedman
b716e1177d [ticket/11747] ucp_prefs_view template events
PHPBB3-11747
2013-07-26 18:33:07 -07:00
Matt Friedman
cd329c55a7 [ticket/11747] ucp_prefs_personal template events
PHPBB3-11747
2013-07-26 18:31:05 -07:00
Joseph Warner
59852b5997 [feature/oauth] More work on login linking accounts
PHPBB3-11673
2013-07-25 14:53:19 -04:00
Joseph Warner
317a71a838 [feature/oauth] Template for ucp_login_link started
PHPBB3-11673
2013-07-25 12:49:54 -04:00
Oliver Schramm
866e475f96 [ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
2013-07-25 15:47:55 +02:00
Oliver Schramm
27126e065d [ticket/11741] Fix empty brackets and remove bullet
PHPBB3-11741
2013-07-24 17:22:10 +02:00
Oliver Schramm
0dcf24acc1 [ticket/8228] Fix whitespaces before code in Firefox
Based on the "[code] enhancements" modification by TerraFrost

PHPBB3-8228
2013-07-24 13:31:12 +02:00
Joseph Warner
5578b7a578 [feature/oauth] Initial UI element added, this is non-final
At this point, all UI changes are purely for testing and should not
be considered final.

PHPBB3-11673
2013-07-22 17:27:56 -04:00
Joseph Warner
0be81468e7 [feature/oauth] Possible way of getting the login data to login_box()
PHPBB3-11673
2013-07-22 16:36:42 -04:00
Joseph Warner
cd49cfacfb [feature/oauth] Initial step in creating OAuth login support
PHPBB3-11673
2013-07-22 16:23:41 -04:00
Andreas Fischer
9c223cdd88 [ticket/11345] Don't include scheme, so HTTPS is used where necessary.
PHPBB3-11345
2013-07-18 22:50:17 +02:00
Andreas Fischer
29322e85ff Merge remote-tracking branch 'cyberalien/ticket/11712' into develop
* cyberalien/ticket/11712:
  [ticket/11712] Fixing typo in editor.js
2013-07-18 18:14:03 +02:00
Vjacheslav Trushkin
d05c04ae40 [ticket/11712] Fixing typo in editor.js
PHPBB3-11712
2013-07-18 19:10:36 +03:00
Vjacheslav Trushkin
0759b606c2 [ticket/11708] Fix bulletin points in notifications
PHPBB3-11708
2013-07-16 20:11:28 +03:00
Andreas Fischer
b9fa2089d5 [ticket/11345] Wrap remote webfonts in S_ALLOW_CDN.
PHPBB3-11345
2013-07-14 21:19:21 +02:00
Vjacheslav Trushkin
424040f890 [ticket/11345] Move css import to template
PHPBB3-11345
2013-07-14 21:19:21 +02:00
Vjacheslav Trushkin
3139867e6d [ticket/11345] Add Droid Sans as fallback font
PHPBB3-11345
2013-07-14 21:19:21 +02:00
Vjacheslav Trushkin
d4b1e2f4f6 [ticket/11345] Change font for buttons
Change font to Open Sans

PHPBB3-11345
2013-07-14 21:19:20 +02:00
Nathan Guse
346efbbb5b Merge pull request #1429 from cyberalien/ticket/11553
Move bulletin points for linklist lists to pseudo classes
2013-07-13 14:20:23 -07:00
Nathan Guse
ea0ef00801 Merge pull request #1550 from nickvergessen/ticket/9649
[ticket/9649] Display information on index for moderators on unapproved posts
2013-07-13 12:03:33 -07:00
Joas Schilling
081350678d [ticket/9649] Display information on index for moderators on unapproved posts
PHPBB3-9649
2013-07-13 14:57:31 -04:00
Nathan Guse
9d86385a36 Merge pull request #1436 from cyberalien/ticket/11563
Fix subPanels() in forum_fn.js
2013-07-13 10:49:04 -07:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Andreas Fischer
6f14c8375e [develop-olympus] Bumping version numbers to final for 3.0.12 releases. 2013-07-12 21:10:05 +02:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS
PHPBB3-11388
2013-07-11 15:31:55 -05:00
Vjacheslav Trushkin
9b194ddb1e [ticket/11553] Typo
PHPBB3-11553
2013-07-11 13:18:01 -04:00
Vjacheslav Trushkin
5362f2a1c1 [ticket/11553] Replace bullet with unicode
PHPBB3-11553
2013-07-11 11:11:38 -04:00
Vjacheslav Trushkin
600d3bd1f6 [ticket/11553] Move bulletin points to pseudo class
Move bulletin points for .linklist lists to pseudo class
Group pseudo classes for .linklist.bulletin and .icon-notification

PHPBB3-11553
2013-07-11 11:11:38 -04:00
Vjacheslav Trushkin
1d97945593 [ticket/11563] Remove duplicate code
PHPBB3-11563
2013-07-11 11:00:04 -04:00
Vjacheslav Trushkin
a9259b12aa [ticket/11563] Dynamically generate panels list
PHPBB3-11563
2013-07-11 10:58:18 -04:00
Vjacheslav Trushkin
6599cabed7 [ticket/11563] Remove unused JS variables
Remove unused JS variables from posting_buttons

PHPBB3-11563
2013-07-11 10:38:55 -04:00
Vjacheslav Trushkin
7a34c7eabe [ticket/11563] Fix subPanels()
Fix subPanels() code
Modernize subPanels() with jQuery
Use HTML5 data attributes instead of including JS

PHPBB3-11563
2013-07-11 10:38:54 -04:00
Joas Schilling
95c88e9099 [ticket/9657] Add new line after opening diff
PHPBB3-9657
2013-07-11 12:34:12 +02:00
Joas Schilling
fe66f53b0a [ticket/9657] Fix labels on confirm_delete_body.html
PHPBB3-9657
2013-07-11 12:28:01 +02:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Nathan Guse
921d44aa4d [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for core
Moved below overall_footer_after so events can add JS files in that event.

PHPBB3-11598
2013-07-05 14:17:46 -05:00
Nathaniel Guse
35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
  ...
2013-07-04 11:19:10 -05:00
Andreas Fischer
b3487b3167 Merge remote-tracking branch 'VSEphpbb/ticket/11577' into develop
* VSEphpbb/ticket/11577:
  [ticket/11577] Readjust min-height to 35px
  [ticket/11577] Correct over-sized Topic Rows
2013-07-03 22:56:30 +02:00
Nathaniel Guse
59d13d0535 [feature/twig] INCLUDEJS behavior now supports local relative paths
This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
2013-07-02 11:07:12 -05:00
Nathaniel Guse
156d5c671f [feature/twig] INCLUDEJS now uses the definition class
This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
2013-07-02 10:13:16 -05:00
Dhruv
c80b80ca0f Merge branch 'ticket/11566' into ticket/11566-develop
* ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha

Conflicts:
	phpBB/report.php
2013-07-01 23:25:29 +05:30
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
2013-07-01 12:26:01 -05:00