makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 08:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
19105 commits 18 branches 192 tags 206 MiB
Commit graph

19105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joseph Warner
662b8fdcec [feature/oauth] Remove OAuth providers to make PR smaller 
PHPBB3-11673
 2013-07-18 12:21:45 -04: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
Joseph Warner
fe9428b725 [feature/oauth] Create means to associate phpBB account with external 
PHPBB3-11673
 2013-07-18 12:12:57 -04:00
Vjacheslav Trushkin
d05c04ae40 [ticket/11712] Fixing typo in editor.js 
PHPBB3-11712
 2013-07-18 19:10:36 +03:00
Joseph Warner
469879716d [feature/oauth] Bitly authentication method, no user_id association 
PHPBB3-11673
 2013-07-18 11:51:59 -04:00
Bruno Ais
16b4116165 [ticket/11654] generate_text_for_display on mcp/mcp_warn.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
 2013-07-18 16:15:36 +01:00
Marc Alexander
96989e536d [ticket/11531] Use abstract class for avatar tests and unify test cases 
PHPBB3-11531
 2013-07-17 23:55:20 +02:00
Joas Schilling
d6a747fbd0 [ticket/11582] Correctly add all required fixtures 
PHPBB3-11582
 2013-07-17 17:27:15 +02:00
Andreas Fischer
c44fbbfbd6 [feature/plupload/deps] Add information about Plupload to AUTHORS. 
PHPBB3-10929
 2013-07-17 02:15:30 +02:00
Andreas Fischer
eaa688eba4 [feature/plupload/deps] Adding parts of plupload_1_5_7.zip 
PHPBB3-10929
 2013-07-17 02:02:19 +02:00
Joas Schilling
32ffae605f Merge remote-tracking branch 'cyberalien/ticket/11708' into develop 
* cyberalien/ticket/11708:
  [ticket/11708] Fix bulletin points in notifications
 2013-07-17 00:32:59 +02:00
Bruno Ais
d183431894 [ticket/11653] generate_text_for_display on mcp/mcp_topic.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
 2013-07-16 21:28:06 +01:00
Bruno Ais
596e9bb69d [ticket/11643] generate_text_for_display on mcp/mcp_queue.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
 2013-07-16 21:20:22 +01:00
Bruno Ais
e7bf3abd1a [ticket/11642] generate_text_for_display on mcp/mcp_post.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
 2013-07-16 21:15:59 +01:00
Bruno Ais
e1e8d4ed34 [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
 2013-07-16 21:01:47 +01:00
Bruno Ais
fc6bed2856 [ticket/11640] generate_text_for_display on functions_privmsgs.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
 2013-07-16 20:32:57 +01:00
Joas Schilling
530b96a4b0 Merge pull request #1575 from bantu/ticket/10931 
[ticket/10931] Add phpbb_php_ini as a service.
 2013-07-16 11:17:06 -07:00
Andreas Fischer
792c730f15 [ticket/10931] Add phpbb_php_ini as a service. 
PHPBB3-10931
 2013-07-16 20:11:58 +02:00
Vjacheslav Trushkin
0759b606c2 [ticket/11708] Fix bulletin points in notifications 
PHPBB3-11708
 2013-07-16 20:11:28 +03:00
Joseph Warner
e9bf2bf09a [feature/oauth] Update interface appropriately 
PHPBB3-11673
 2013-07-15 15:28:31 -04:00
Joseph Warner
47b998ae48 [feature/oauth] Define method to perform login actions for a provider 
PHPB3-11673
 2013-07-15 15:24:48 -04:00
Joseph Warner
8641127da5 [feature/oauth] Correct function call 
PHPBB3-11673
 2013-07-15 15:19:36 -04:00
Bruno Ais
5f19ca6a6f [ticket/11639] Whitespace fixing 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
 2013-07-15 20:09:59 +01:00
Bruno Ais
dde9a1fb27 [ticket/11639] Added an useful comment. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
 2013-07-15 20:08:17 +01:00
Bruno Ais
f96f2a9e23 [ticket/11639] generate_text_for_display on functions_posting.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
 2013-07-15 20:06:54 +01:00
Joseph Warner
6e1c522bdd [feature/oauth] Update oauth to reflect recent changes 
PHPBB3-11673
 2013-07-15 14:57:22 -04:00
Joseph Warner
eb17462f90 [feature/oauth] Fix typo 
PHPBB3-11673
 2013-07-14 17:45:42 -04:00
Joseph Warner
0156bac3e2 [feature/oauth] Update auth provider oauth to take in service providers 
PHPBB3-11673
 2013-07-14 17:42:26 -04:00
Joseph Warner
80c5a42525 [feature/oauth] Add constructor arguments to services file 
PHPBB3-11673
 2013-07-14 17:26:38 -04:00
Joseph Warner
247a002a14 [feature/oauth] Add constructors 
PHPBB3-11673
 2013-07-14 17:24:01 -04:00
Joseph Warner
440904a0c8 [feature/oauth] Add OAuth services to service file 
PHPBB3-11673
 2013-07-14 17:03:19 -04:00
Marc Alexander
bc6122b64f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-07-14 16:51:46 -04:00
Nils Adermann
b3e8734a49 [ticket/11700] Load the dbms with namespaces 
PHPBB3-11700
 2013-07-14 16:35:04 -04:00
Nils Adermann
adc58ba084 [ticket/11700] Use a new style constructor for the error collector 
PHPBB3-11700
 2013-07-14 16:28:30 -04:00
Nils Adermann
3d45f69572 [ticket/11700] Load namespaced classes in tests 
PHPBB3-11700
 2013-07-14 16:21:59 -04:00
Joseph Warner
a8e60c306d [feature/oauth] Remove get_service_credentials() from oauth provider 
PHPBB3-11673
 2013-07-14 16:02:10 -04:00
David King
1891e24ea6 Merge remote-tracking branch 'upstream/pr/1570' into develop 
* upstream/pr/1570:
  [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
 2013-07-14 16:02:09 -04:00
Joseph Warner
6a2871692c [feature/oauth] Get service credentials on each OAuth service 
PHPBB3-11673
 2013-07-14 16:00:41 -04:00
Joseph Warner
55cdc874e6 [feature/oauth] Set required scopes on more providers 
PHPBB3-11673
 2013-07-14 15:53:18 -04:00
Joas Schilling
d8dea63778 Merge pull request #9 from igorw/ticket/11574 
[ticket/11574] Fix more issues in the updater
 2013-07-14 12:47:49 -07:00
Igor Wiedler
8928240dc3 [ticket/11574] Fix more issues in the updater 
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
 2013-07-14 15:40:19 -04:00
Nils Adermann
62b33968c2 [ticket/11700] include and define are not valid class names 
PHPBB3-11700
 2013-07-14 15:38:04 -04:00
Joseph Warner
0ebff82ad3 [feature/oauth] Last five oauth services 
PHPBB3-11673
 2013-07-14 15:35:51 -04:00
Igor Wiedler
c2b31ca101 Merge remote-tracking branch 'upstream/develop' into ticket/11574 
* upstream/develop:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
  [ticket/11697] author_search() used incorrect parameter
 2013-07-14 15:27:25 -04: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
Joseph Warner
947aa2b6b4 [feature/oauth] Create OAuth service classes 
PHPBB3-11673
 2013-07-14 15:16:34 -04:00
Marc Alexander
a0e5f83311 [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar 
PHPBB3-11706
 2013-07-14 15:13:09 -04:00