Commit graph

8358 commits

Author SHA1 Message Date
brunoais
7a02a8bcf2 [ticket/11663] Add the doc block about the parameters.
PHPBB3-11663
2013-08-17 20:11:26 +01:00
Joseph Warner
e2d0a0b7c8 [feature/oauth] Fix template not refreshing issue
PHPBB3-11673
2013-08-14 23:18:10 -04:00
Joseph Warner
43e08e221f [feature/oauth] Fix bug found in testing
PHPBB3-11673
2013-08-14 22:50:49 -04: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
Joseph Warner
9cd80345ad [feature/oauth] Implement unlinking in OAuth
PHPBB3-11673
2013-08-14 16:33:10 -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
brunoais
53888ec540 [ticket/11663] Add the doc block about the return value.
generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong.

PHPBB3-11663
2013-08-14 10:44:45 +01:00
rechosen
e2014ab76e [ticket/11786] Fix PHPDoc documentation of a few events
Fixed some PHPDoc errors I noticed while working on the karma extension.
Mostly spacing issues or omitted characters, though there was one description
that made no sense at all.

PHPBB3-11786
2013-08-13 16:23:54 +02:00
Joseph Warner
836d3ba22e [feature/oauth] Handle hidden fields
PHPBB3-11673
2013-08-12 15:29:22 -04:00
Joseph Warner
4003e077c1 [feature/oauth] Get the OAuth template in place for ucp_auth_link
PHPBB3-11673
2013-08-12 14:43:35 -04:00
Joseph Warner
a479f919ff [feature/oauth] Error handling on page
PHPBB3-11673
2013-08-12 12:53:22 -04:00
brunoais
b6d6938b9f [ticket/11663] Make generate_text_for_storage return the errors.
generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong.

PHPBB3-11663
2013-08-09 17:01:09 +01:00
Joseph Warner
69cb2e4c60 [feature/oauth] More template work
PHPBB3-11673
2013-08-09 05:26:44 -04:00
Joseph Warner
0b80aaf217 [feature/oauth] Add method to return necessary data for auth_link
PHPBB3-11673
2013-08-09 05:17:27 -04:00
Joseph Warner
deb62d51fe [feature/oauth] Start building the template
PHPBB3-11673
2013-08-09 05:12:57 -04:00
Joseph Warner
b5255d42b5 [feature/oauth] Default auth_link into UCP_PROFILE not UCP_MAIN
PHPBB3-11673
2013-08-09 04:39:06 -04:00
Oliver Schramm
74559eb0d5 [ticket/11774] Fix constant to avoid PHP errors
PHPBB3-11774
2013-08-08 15:50:20 +02:00
Joas Schilling
91eccc708b [ticket/11775] Fix error when moving the last post to another topic
PHPBB3-11775
2013-08-08 13:42:51 +02:00
Dhruv
f35d732f40 Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
2013-08-08 13:56:39 +05:30
Joseph Warner
4683c37682 [feature/oauth] Forgot to have login_link be "in login" in ucp
PHPBB3-11673
2013-08-05 17:35:44 -04:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page
PHPBB3-11673
2013-08-05 15:38:03 -04:00
Joas Schilling
3f86d50338 Merge remote-tracking branch 'brunoais/ticket11639' into develop
* brunoais/ticket11639:
  [ticket/11639] Changing how censorship is handled.
  [ticket/11639] Removed a non-needed unset
  [ticket/11639] Whitespace fixing
  [ticket/11639] Whitespace fixing
  [ticket/11639] Added an useful comment.
  [ticket/11639] generate_text_for_display on functions_posting.php
2013-08-04 01:56:39 +02:00
brunoais
28a0a9e0b1 [ticket/11639] Changing how censorship is handled.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-08-03 21:46:06 +01:00
Joas Schilling
02435f92ba Merge remote-tracking branch 'brunoais/ticket/11642' into develop
* brunoais/ticket/11642:
  [ticket/11642] Use $parse_flags
  [ticket/11642] Fixed typo in the variable name.
  [ticket/11642] generate_text_for_display on mcp/mcp_post.php
2013-08-03 17:52:31 +02:00
Joas Schilling
a4fc7840b1 Merge remote-tracking branch 'brunoais/ticket/11643' into develop
* brunoais/ticket/11643:
  [ticket/11643] Use $parse_flags
  [ticket/11643] Fixed typo in the variable name.
  [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
2013-08-03 17:47:02 +02:00
Joas Schilling
96cef7f549 Merge remote-tracking branch 'brunoais/ticket/11641' into develop
* brunoais/ticket/11641:
  [ticket/11641] Use $parse_flags
  [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
2013-08-03 17:37:54 +02:00
Joas Schilling
78623bf2ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11762] Added call to test class's parent::setUp().
  [ticket/11762] Fixed test's filename
  [ticket/11762] Use the === operator to distinguish "0" from ""
2013-08-03 15:37:01 +02:00
s9e
8a02db317e [ticket/11762] Use the === operator to distinguish "0" from ""
PHPBB3-11762
2013-08-03 12:20:52 +02:00
Joseph Warner
1ae2283b34 [feature/oauth] Finish updating interface and related code
PHPBB3-11673
2013-08-02 14:21:25 -04:00
Joseph Warner
245e71e4e2 [feature/oauth] Add get_login_data to the auth_provider_interface
PHPBB3-11673
2013-08-02 14:05:44 -04:00
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Joas Schilling
9f60a38539 Merge remote-tracking branch 'brunoais/ticket/11653' into develop
* brunoais/ticket/11653:
  [ticket/11653] Use $parse_flags
  [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
2013-08-01 16:50:50 +02:00
Joas Schilling
498f6ccbfc Merge remote-tracking branch 'brunoais/ticket/11655' into develop
* brunoais/ticket/11655:
  [ticket/11653] Use $parse_flags
  [ticket/11653] Missing ";"
  [ticket/11655] Use $parse_flags
  [ticket/11655] wrong var names for the uid and for the bitfield
  [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
2013-08-01 11:39:17 +02:00
Bruno Ais
2f25197279 [ticket/11641] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
2013-08-01 10:16:33 +01:00
Bruno Ais
3ae33910fc [ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:14:34 +01:00
Bruno Ais
a302a09ffb [ticket/11642] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
2013-08-01 10:12:58 +01:00
Bruno Ais
ea6938d3e5 [ticket/11643] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
2013-08-01 10:11:08 +01:00
Bruno Ais
c806375828 [ticket/11653] Missing ";"
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:09:11 +01:00
Bruno Ais
776773522b [ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:07:58 +01:00
Bruno Ais
c2aff70cf5 [ticket/11655] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
2013-08-01 10:03:04 +01:00
Joas Schilling
ca07be9c57 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:40:35 +02:00
Joseph Warner
aa80ac44a4 [feature/oauth] Login_link works with ucp_register now
PHPBB3-11673
2013-07-31 14:54:28 -04:00
Joseph Warner
3b19d5c198 [feature/oauth] Fix errors on ucp_login_link
PHPBB3-11673
2013-07-31 14:46:45 -04:00
Joseph Warner
b6d93d21ba [feature/oauth] Login_link in registration
PHPBB3-11673
2013-07-31 13:46:57 -04:00
Joseph Warner
0cbfa8ffd4 [feature/oauth] Start working on login_link registration support
PHPBB3-11673
2013-07-30 14:45:23 -04:00