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

18226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Guse
baa73f6933 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/11832 
* remotes/imkingdavid/ticket/11824:
  [ticket/11824] Revert changes in functions.php
  [ticket/11824] Reorganize test file
  [ticket/11824] Update language string for board settings
  [ticket/11824] Revert changes to functions_content.php
  [ticket/11824] Add tests for urls with mod_rewrite enabled
  [ticket/11824] Correct a comment
  [ticket/11824] Change copyright year in migration file
  [ticket/11824] Remove unused globals
  [ticket/11824] Fix smilies
  [ticket/11824] Fix logic
  [ticket/11824] Add option for mod_rewrite
 2013-09-12 12:45:17 -05:00
Nathan Guse
934786d45d [ticket/11832] Fix build_url and the S_LOGIN_ACTION 
PHPBB3-11832
 2013-09-12 12:30:16 -05:00
Nathan Guse
d9fdf41ad8 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832 
# By Joseph Warner (187) and others
# Via Andreas Fischer (2) and others
* 'develop' of github.com:phpbb/phpbb3: (189 commits)
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [feature/oauth] Fix tabindex
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  [feature/oauth] More small fixes
  [feature/oauth] More minor changes from review
  [feature/oauth] Fix small bug introduced by update in OAuth library
  [feature/oauth] Fix small issues on ucp pages
  [feature/oauth] Fix typo in OAuth logout method
  [feature/oauth] Make token storage service ignorant
  [feature/oauth] Update oauth::logout() to use clearAllTokens()
  [feature/oauth] Update storage implementation due to inteface change
  [feature/oauth] Update lusitanian/oauth to stable branch
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  [feature/oauth] OAuth service exception
  [feature/oauth] A few more minor changes
  [feature/oauth] Changes due to code review
  [feature/oauth] Fix redirects
  [feature/oauth] Fix issues on ucp_login_link from review
  ...
 2013-09-12 11:56:36 -05:00
David King
310844fb7d [ticket/11824] Revert changes in functions.php 
These will be added in another PR

PHPBB3-11824
 2013-09-12 09:27:54 -07:00
David King
2f91fc9f6c [ticket/11824] Reorganize test file 
PHPBB3-11824
 2013-09-12 09:22:51 -07:00
David King
6f4ad0bcfa [ticket/11824] Update language string for board settings 
PHPBB3-11824
 2013-09-12 09:21:40 -07:00
David King
8e9ee0a4dc [ticket/11824] Revert changes to functions_content.php 
These will be fixed in another PR

PHPBB3-11824
 2013-09-12 09:18:18 -07:00
Nathan Guse
4c00c77739 [ticket/11832] Changing comments to say app.php rather than index.php 
PHPBB3-11832
 2013-09-12 11:08:40 -05:00
Nathan Guse
946ab9aa75 [ticket/11832] We must instantiate the $phpbb_filesystem in common 
PHPBB3-11832
 2013-09-12 11:05:14 -05:00
Nathan Guse
b06c8a80d1 [ticket/11832] Fix the web path corrections 
Add some real life examples to test

PHPBB3-11832
 2013-09-12 10:25:49 -05:00
David King
f74a04c976 Merge pull request #1707 from EXreaction/ticket/11835 
[ticket/11835] Fix ucp_auth_link adding in migration
 2013-09-10 19:44:41 -07:00
Nathan Guse
7435c40b5c [ticket/11835] Fix ucp_auth_link adding in migration 
PHPBB3-11835
 2013-09-10 21:31:19 -05:00
David King
fc1dfd779d Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop 2013-09-10 15:48:29 -07:00
Joseph Warner
18f6a16101 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04:00
Nathan Guse
3a4efa7959 [ticket/11832] More extensive testing 
PHPBB3-11832
 2013-09-10 11:15:24 -05:00
Nathan Guse
c46637990e [ticket/11832] Use dirname(__FILE__) 
PHPBB3-11832
 2013-09-10 10:14:57 -05:00
Nathan Guse
3684d8e971 [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid 
PHPBB3-11832
 2013-09-10 10:13:26 -05:00
Nathan Guse
d5f93f5ce4 Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" 
This reverts commit 5e09afa0bc.
 2013-09-10 10:06:13 -05:00
Andreas Fischer
71aeec40f6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
 2013-09-10 02:53:33 +02:00
Andreas Fischer
c1557cf78d Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
 2013-09-10 02:53:19 +02:00
Andreas Fischer
38afdd792f [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. 
A wrong fix version was assigned to PHPBB3-11288.
 2013-09-10 02:17:41 +02:00
Nathan Guse
5e09afa0bc [ticket/11832] Make $phpbb_container a global initiated by the framework 
Setup common items needed from the container (e.g. filesystem)

PHPBB3-11832
 2013-09-09 18:47:25 -05:00
Nathan Guse
289bc2a411 [ticket/11832] Fix log tests 
PHPBB3-11832
 2013-09-09 18:27:12 -05:00
Nathan Guse
6692db892f [ticket/11832] update_web_root_path helper and tests 
PHPBB3-11832
 2013-09-09 18:19:50 -05:00
Nathan Guse
f30b87519e [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) 
Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path

PHPBB3-11832
 2013-09-09 17:28:56 -05:00
Nathan Guse
2146d0c36b Merge pull request #1703 from cyberalien/ticket/develop/11832 
Fix path detection
 2013-09-09 11:19:52 -07:00
Vjacheslav Trushkin
07632d46fc [ticket/develop/11832] Fix path detection 
Clean up path, do not count first /

PHPBB3-11832
 2013-09-09 20:52:29 +03:00
Joseph Warner
3f81057f96 [feature/oauth] Fix tabindex 
PHPBB3-11673
 2013-09-09 11:40:29 -04:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
 2013-09-06 20:35:54 -04:00
David King
4eab9a8c53 [ticket/11824] Add tests for urls with mod_rewrite enabled 
PHPBB3-11824
 2013-09-06 13:14:07 -07:00
David King
d1c0e93895 [ticket/11824] Correct a comment 
PHPBB3-11824
 2013-09-06 13:08:35 -07:00
David King
50b24662bd [ticket/11824] Change copyright year in migration file 
PHPBB3-11824
 2013-09-06 13:07:02 -07:00
David King
ceaf1ba0bc [ticket/11824] Remove unused globals 
PHPBB3-11824
 2013-09-06 12:59:01 -07:00
David King
bbcd3967ef [ticket/11824] Fix smilies 
PHPBB3-11824
 2013-09-06 12:53:34 -07:00
David King
2ccc992da1 [ticket/11824] Fix logic 
PHPBB3-11824
 2013-09-06 12:48:09 -07:00
Nathan Guse
dd86e8d0ae Merge pull request #1618 from VSEphpbb/ticket/11747 
[ticket/11747] UCP Prefs Core and Template Events
 2013-09-05 11:36:25 -07:00
Nathan Guse
9d5ab7615f Merge pull request #1435 from cyberalien/ticket/11562 
forum_fn.js cleanup
 2013-09-05 11:27:42 -07:00
Nathan Guse
f71b6c8ea5 Merge pull request #1695 from dhruvgoel92/ticket/11825 
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
 2013-09-05 11:17:31 -07:00
Nathan Guse
ab0af38629 Merge pull request #1651 from cyberalien/ticket/11782 
Fix layout of notices in posts
 2013-09-05 08:26:29 -07:00
Andreas Fischer
462355d654 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
 2013-09-05 00:40:59 +02:00
Andreas Fischer
fcb9476615 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-09-05 00:37:40 +02:00
David King
010da72f64 [ticket/11824] Add option for mod_rewrite 
PHPBB3-11824
 2013-09-03 16:57:27 -07:00
Dhruv
19074a3420 [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ 
PHPBB3-11825
 2013-09-03 19:44:07 +05:30
David King
8d6b03c438 Merge remote-tracking branch 'EXreaction/ticket/11791' into develop 2013-09-02 16:45:12 -07:00
David King
cc2302b537 Merge remote-tracking branch 'EXreaction/ticket/11818' into develop 2013-09-02 16:36:28 -07:00
David King
6e028a5ecc Merge remote-tracking branch 'EXreaction/ticket/11755' into develop 2013-09-02 16:12:30 -07:00
Nathan Guse
4fd99a7b2e Merge pull request #1102 from imkingdavid/ticket/11215 
[ticket/11215] Correct paths when path info is used for controller access
 2013-09-02 15:55:22 -07:00
David King
918ffc10e1 [ticket/11215] Remove unnecessary comment 
PHPBB3-11215
 2013-09-02 15:34:14 -07:00
Andreas Fischer
67f89cc319 Merge remote-tracking branch 'EXreaction/ticket/11812' into develop 
* EXreaction/ticket/11812:
  [ticket/11812] Fix empty define
 2013-09-03 00:15:37 +02:00
Nathan Guse
536eeb7afa [ticket/11755] MySQL upgrader out of date 
De-duplicating code from create_schema_files, mysql_upgrader.

New file phpbb/db/schema_data which contains all the current schema data.

New function in db_tools public static function get_dbms_type_map() to make the
type map available everywhere (without requiring $db be setup already)

PHPBB3-11755
 2013-09-02 16:58:34 -05:00