Andreas Fischer
ba9d303d52
Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12
...
* dhruvgoel92/ticket/11802:
[ticket/11802] replace $browser with $user->browser
2013-08-20 00:46:33 +02:00
Dhruv
aa3d2ef7a9
[ticket/11802] replace $browser with $user->browser
...
PHPBB3-11802
2013-08-20 04:14:20 +05:30
Andreas Fischer
c6f56f5149
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11801] removed some whitespace and added missing semi colon's in css
Conflicts:
phpBB/styles/prosilver/theme/colours.css
2013-08-19 20:48:17 +02:00
Andreas Fischer
8c69db6ab2
Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympus
...
* Prosk8er/ticket/11801:
[ticket/11801] removed some whitespace and added missing semi colon's in css
2013-08-19 20:45:34 +02:00
Dhruv
f7b967dc5a
Merge remote-tracking branch 'Elsensee/ticket/11760' into develop
...
# By Oliver Schramm
# Via Oliver Schramm
* Elsensee/ticket/11760:
[ticket/11760] Use phpbb_version_compare() wrapper
2013-08-19 23:28:53 +05:30
Prosk8er
f61db86b8d
[ticket/11801] removed some whitespace and added missing semi colon's in css
...
PHPBB3-11801
2013-08-19 13:31:30 -04:00
rechosen
953ca1785f
[ticket/11792] Add performance remark to core.user_setup event PHPDoc
...
To prevent extension authors from loading all their translations globally, a
remark on this was added to the PHPDoc documentation of the core.user_setup
event.
PHPBB3-11792
2013-08-19 11:06:36 +02:00
rechosen
88e5ba4e57
[ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
...
To allow extensions to add global language strings just like mods can, add the
'lang_set_ext' variable to the core.user_setup event. It requires an ext_name
to be specified as well as a lang_set, and loads the specified lang_set in the
context of the extension.
PHPBB3-11792
2013-08-19 11:06:36 +02:00
Andreas Fischer
3cc0a4149f
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11789] Remove inline color in memberlist_view
Conflicts:
phpBB/styles/subsilver2/template/memberlist_view.html
2013-08-18 17:10:26 +02:00
Andreas Fischer
78f1e11aeb
Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus
...
* cyberalien/ticket/11789:
[ticket/11789] Remove inline color in memberlist_view
2013-08-18 17:08:14 +02:00
Vjacheslav Trushkin
6f566fdaf0
[ticket/11789] Remove inline color in memberlist_view
...
PHPBB3-11789
2013-08-18 10:56:16 +03:00
Andreas Fischer
09f547e373
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11789] Remove colors from HTML code
Conflicts:
phpBB/styles/subsilver2/template/ucp_pm_history.html
2013-08-18 03:07:32 +02:00
Andreas Fischer
20fb220b4f
Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus
...
* cyberalien/ticket/11789:
[ticket/11789] Remove colors from HTML code
2013-08-18 03:00:42 +02:00
Andreas Fischer
8fd49f9df8
Merge remote-tracking branch 'cyberalien/ticket/11796' into develop
...
* cyberalien/ticket/11796:
[ticket/11796] Replace pagination with pagination.html
2013-08-18 02:50:32 +02:00
Andreas Fischer
5bb02647e6
Merge remote-tracking branch 'cyberalien/ticket/11779' into develop
...
* cyberalien/ticket/11779:
[ticket/11779] Fix unapproved messages class name
2013-08-18 02:37:07 +02:00
Andreas Fischer
a808c4f9c9
Merge remote-tracking branch 'cyberalien/ticket/11800' into develop
...
* cyberalien/ticket/11800:
[ticket/11800] Fix scripts variable in subsilver simple_footer
[ticket/11800] Fix JavaScript in simple_footer.html
[ticket/11800] Remove forum_fn from memberlist_search.html
2013-08-18 02:02:44 +02:00
Andreas Fischer
55d911a2fd
Merge remote-tracking branch 'cyberalien/ticket/11754' into develop
...
* cyberalien/ticket/11754:
[ticket/11754] Remove styleswitcher leftovers
2013-08-18 01:55:56 +02:00
Dhruv
c54f1faf59
Merge remote-tracking branch 'VSEphpbb/ticket/11784' into develop
...
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/11784:
[ticket/11784] Remove naming redundancy for event listeners
2013-08-18 01:09:33 +05:30
Vjacheslav Trushkin
9174788762
[ticket/11800] Fix scripts variable in subsilver simple_footer
...
PHPBB3-11800
2013-08-17 19:21:10 +03:00
Vjacheslav Trushkin
487822d12f
[ticket/11800] Fix JavaScript in simple_footer.html
...
Include forum_fn.js via INCLUDEJS
Move $SCRIPTS after footer event, allowing extensions to include scripts
Use correct template variable for including scripts
PHPBB3-11800
2013-08-17 19:18:25 +03:00
Vjacheslav Trushkin
0ed7bd8a5b
[ticket/11800] Remove forum_fn from memberlist_search.html
...
PHPBB3-11800
2013-08-17 19:17:17 +03:00
Andreas Fischer
772494af7e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11794] Add missing array element commas to docs/coding-guidelines.html
2013-08-16 18:04:52 +02:00
Andreas Fischer
afb6800b59
Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympus
...
* rechosen/ticket/11794:
[ticket/11794] Add missing array element commas to docs/coding-guidelines.html
2013-08-16 18:02:09 +02:00
Vjacheslav Trushkin
87dd739a84
[ticket/11796] Replace pagination with pagination.html
...
PHPBB3-11796
2013-08-16 18:52:07 +03:00
rechosen
48f6f4559c
[ticket/11794] Add missing array element commas to docs/coding-guidelines.html
...
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.
PHPBB3-11794
2013-08-16 17:48:36 +02:00
Joseph Warner
83515cd3d4
[feature/oauth] Fix remaining issues with token storage
...
PHPBB3-11673
2013-08-15 01:14:53 -04:00
Joseph Warner
2bf97a01ce
[feature/oauth] Refactor test to provide for easier to read tests
...
PHPBB3-11673
2013-08-14 23:43:07 -04:00
Joseph Warner
e2d0a0b7c8
[feature/oauth] Fix template not refreshing issue
...
PHPBB3-11673
2013-08-14 23:18:10 -04:00
Joseph Warner
0ea3103a44
[feature/oauth] Don't allow external login methods on admin auth
...
PHPBB3-11673
2013-08-14 23:01:03 -04:00
Joseph Warner
43e08e221f
[feature/oauth] Fix bug found in testing
...
PHPBB3-11673
2013-08-14 22:50:49 -04:00
Andreas Fischer
96789df962
Merge remote-tracking branch 'cyberalien/ticket/11770' into develop
...
* cyberalien/ticket/11770:
[ticket/11770] Fix class name for pm list
2013-08-15 02:24:17 +02:00
Andreas Fischer
1ac1b9b7ee
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
2013-08-15 01:40:08 +02:00
Andreas Fischer
d089f9693a
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:56 +02:00
Andreas Fischer
b08928ee1c
Merge remote-tracking branch 'nickvergessen/ticket/11775' into prep-release-3.0.12
...
* nickvergessen/ticket/11775:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:40 +02:00
Joas Schilling
c30d4025d2
[ticket/11775] Fix doc blocks syntax
...
PHPBB3-11775
2013-08-15 01:36:38 +02:00
Joas Schilling
4b0adfcff5
[ticket/11775] Remove spaces at line ends
...
PHPBB3-11775
2013-08-15 01:35:02 +02:00
Joseph Warner
0ea555bbc7
[feature/oauth] Update auth provider interface
...
PHPBB3-11673
2013-08-14 17:16:00 -04:00
Joseph Warner
d13a1788f0
[feature/oauth] Update language constants for ucp_auth_link
...
PHPBB3-11673
2013-08-14 17:08:08 -04:00
Joseph Warner
59c8db28d6
[feature/oauth] Always store session_id with token
...
PHPBB3-11673
2013-08-14 17:01:33 -04:00
Joseph Warner
823b7e2b84
[feature/oauth] Fix small error in method call
...
PHPBB3-11673
2013-08-14 16:59:01 -04:00
Joseph Warner
abebe83edb
[feature/oauth] No need for this line
...
PHPBB3-11673
2013-08-14 16:52:55 -04:00
Joseph Warner
7bd4c88ec5
[feature/oauth] Fix errors in oauth
...
PHPBB3-11673
2013-08-14 16:45:31 -04:00
Joseph Warner
9cd80345ad
[feature/oauth] Implement unlinking in OAuth
...
PHPBB3-11673
2013-08-14 16:33:10 -04:00
Joseph Warner
a2237ea8a7
[feature/oauth] Add unlink_account to auth interface
...
PHPBB3-11673
2013-08-14 16:21:06 -04:00
Joseph Warner
9c91446ef7
[feature/oauth] Document internal functions
...
PHPBB3-11673
2013-08-14 16:07:38 -04:00
Joseph Warner
cd12786e58
[feature/oauth] Fix errors found in testing linking
...
PHPBB3-11673
2013-08-14 16:02:47 -04:00
Joseph Warner
bb68338861
[feature/oauth] Refactor oauth::link_account for two paths
...
PHPBB3-11673
2013-08-14 15:55:58 -04:00
Joseph Warner
afebbf231a
[feature/oauth] Update link_account to allow for two methods of linking
...
PHPBB3-11673
2013-08-14 15:36:20 -04:00
Joseph Warner
ce387d9bfc
[feature/oauth] Fix errors in ucp_auth_link
...
PHPBB3-11673
2013-08-14 15:21:24 -04:00
Joseph Warner
67b1ec5bb8
[feature/oauth] Start implementing link/unlink actions
...
PHPBB3-11673
2013-08-14 15:19:40 -04:00
