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

20228 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Guse
cd141883a5 [ticket/11832] Correct paths in tests 
PHPBB3-11832
 2013-09-15 18:55:18 -05:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
 2013-09-16 01:24:05 +02:00
Nils Adermann
bb395bbc50 [ticket/11700] Update finder tests for namespaced classnames 
PHPBB3-11700
 2013-09-16 00:41:49 +02:00
Nils Adermann
bdaf68c113 [ticket/11700] Don't prefix dbms classnames with \ 
PHPBB3-11700
 2013-09-16 00:41:44 +02:00
Nils Adermann
d297eb4aec [ticket/11700] Get the installer to run with namespaces 
PHPBB3-11700
 2013-09-16 00:41:38 +02:00
Nils Adermann
9a2c29a175 [ticket/11700] DI container test needs namespaces to work properly 
PHPBB3-11700
 2013-09-16 00:40:27 +02:00
Nils Adermann
dc2f4a3663 [ticket/11700] Avoid \t in double quoted strings for template code 
PHPBB3-11700
 2013-09-16 00:39:38 +02:00
Nils Adermann
d122d84050 [ticket/11700] Use underscores for generated search test wrappers 
PHPBB3-11700
 2013-09-16 00:39:36 +02:00
Nils Adermann
2a1207b14f [ticket/11700] Correclty use namespaces in notifications 
PHPBB3-11700
 2013-09-16 00:39:34 +02:00
Nils Adermann
239381b946 [ticket/11700] Fix expected class name output from dbms convert 
PHPBB3-11700
 2013-09-16 00:39:32 +02:00
Nils Adermann
e10c3d8c08 [ticket/11700] Fix config namespace mishap in cache tests 
PHPBB3-11700
 2013-09-16 00:39:30 +02:00
Nils Adermann
76dfe153fc [ticket/11700] Fix class loader tests for namespaces 
PHPBB3-11700
 2013-09-16 00:39:27 +02:00
Nils Adermann
97012dd851 [ticket/11700] Fix dbal tests after config namespace mishap 
PHPBB3-11700
 2013-09-16 00:39:22 +02:00
Nils Adermann
1a6202d517 [ticket/11700] Fix config db tests after namespace mishap 
PHPBB3-11700
 2013-09-16 00:39:08 +02:00
Nils Adermann
43c5ed570f [ticket/11700] Fix avatar tests 
PHPBB3-11700
 2013-09-16 00:29:14 +02:00
Nils Adermann
ee735685ac [ticket/11700] Fix number class names in 3.0.x migrations 
PHPBB3-11700
 2013-09-16 00:29:04 +02:00
Nils Adermann
e1239b455f [ticket/11700] Namespaces and class names should not start with digits 
PHPBB3-11700
 2013-09-16 00:29:00 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces 
PHPBB3-11700
 2013-09-16 00:25:27 +02:00
Nils Adermann
196e1813cd [ticket/11700] Add develop scripts to use namespaces and rename interfaces 
PHPBB3-11700
 2013-09-16 00:25:21 +02:00
Nathan Guse
8e02f9bd7d [ticket/11832] Correct ROOT_PATH variable 
PHPBB3-11832
 2013-09-15 16:44:09 -05:00
Nathan Guse
9e8babbf6e [ticket/11832] get_url() from phpbb_template_asset should return web path 
PHPBB3-11832
 2013-09-15 16:42:02 -05:00
Joas Schilling
ae6f37d559 Merge remote-tracking branch 'dhruv/ticket/11735' into develop 
* dhruv/ticket/11735:
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
 2013-09-15 21:20:04 +02:00
Dhruv
a3b0590f68 [ticket/11735] Display disabled checkbox in subsilver for read notifications 
PHPBB3-11735
 2013-09-16 00:34:22 +05:30
Vjacheslav Trushkin
7c5675942b [ticket/11846] Replace empty p with margin-top 
PHPBB3-11846
 2013-09-15 21:22:06 +03:00
Joas Schilling
6dc7a1407a Merge remote-tracking branch 'dhruv/ticket/11735' into develop 
* dhruv/ticket/11735:
  [ticket/11735] Display disabled checkbox when notification is already read
 2013-09-15 18:25:13 +02:00
Dhruv
e4977b714e [ticket/11271] Use absolute path for displaying inline attachments in feeds 
PHPBB3-11271
 2013-09-15 20:40:32 +05:30
Dhruv
41282c5065 [ticket/11735] Display disabled checkbox when notification is already read 
PHPBB3-11735
 2013-09-15 20:29:45 +05:30
erangamapa
1450d29aba [ticket/11271] Changed executable bit. 
Changed executable bit value from 755 to 644.

PHPBB3-11271
 2013-09-15 15:42:55 +05:30
erangamapa
08fdd30917 [ticket/11271] Formatting code and removing null assignment. 
Formatted code and replaced null assignment with empty array
assignment to attachments parameter in method 'feed_generate_content'.

PHPBB3-11271
 2013-09-15 15:42:51 +05:30
erangamapa
31957abeb1 [ticket/11271] Removing unnecessary database object 
Removed unnecessary global database object from 'feed_generate_content'
Method.

PHPBB3-11271
 2013-09-15 15:42:37 +05:30
erangamapa
86d83f2bb2 [ticket/11271] Separated attachment fetching query 
Removed external query used to fetch related attachments.
Added attachments fetching method with database query to
post based feed.

PHPBB3-11271
 2013-09-15 15:42:24 +05:30
erangamapa
098fdf95ae [ticket/11271] Fetched feed attachments before loop. 
Fetched feed attachments before looping through feed items and
send them to method 'feed_generate_content' for each feed item.

PHPBB3-11271
 2013-09-15 15:42:09 +05:30
erangamapa
224c863377 [ticket/11271] Removed in-line attachment comments properly. 
Added a new regex to remove in-line attachment comments.

PHPBB3-11271
 2013-09-15 15:41:52 +05:30
erangamapa
72b92f70f1 [ticket/11271] Displaying in-line attached images in ATOM feed. 
In-line attached images are not displaying as they are not parsing.
Included 'parse_attachments' column name for data fetching queries
in feed.php. Checked weather feeds have in-line attachments and
parsed them by using parse_attachments() method.

PHPBB3-11271
 2013-09-15 15:41:36 +05:30
Dhruv
6ce5a72c55 Merge remote-tracking branch 'Prosk8er/ticket/11844' into develop 
# By Prosk8er
# Via Prosk8er
* Prosk8er/ticket/11844:
  [ticket/11844] update acp/authentication language var
 2013-09-15 11:18:01 +05:30
Prosk8er
30a26f23a4 [ticket/11844] update acp/authentication language var 
the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php

PHPBB3-11844
 2013-09-14 15:28:04 -04:00
Nathan Guse
939174eac8 Merge pull request #1666 from cyberalien/ticket/11795 
Move JS from html files to forum_fn.js
 2013-09-14 12:17:41 -07:00
Marc Alexander
beafef0000 [feature/passwords] Add missing function documentation 
Additionally, a new line has been added to make the code look nicer.

PHPBB3-11610
 2013-09-14 14:17:14 +02:00
Marc Alexander
19512b2595 [feature/passwords] Rename "crypto" files to "passwords" files 
PHPBB3-11610
 2013-09-14 14:04:48 +02:00
Marc Alexander
b810957c4b [feature/passwords] Properly set convert_flag and add test for it 
PHPBB3-11610
 2013-09-14 13:55:53 +02:00
Marc Alexander
8b9370c6a9 [feature/passwords] Define default hashing algorithm in container file 
The default hashing algorithm type is defined as a parameter in the service
definition file for the password hashing system. This will allow us to change
this in the future but it will also prevent unexperienced admins from changing
the hashing algorithm.

PHPBB3-11610
 2013-09-14 13:55:45 +02:00
Marc Alexander
58755c4972 [feature/passwords] Add get_name() method to drivers 
This will allow us to actually properly differentiate between the available
drivers.

PHPBB3-11610
 2013-09-14 13:55:39 +02:00
Marc Alexander
df8e5f4c3c [feature/passwords] Move migrations file to phpbb folder 
PHPBB3-11610
 2013-09-14 13:55:34 +02:00
Marc Alexander
9b24fda5cd [feature/passwords] Move files after namespacing changes 
PHPBB3-11610
 2013-09-14 13:55:28 +02:00
Marc Alexander
2e453eb2cb [feature/passwords] Add legacy support for md5 passwords 
PHPBB3-11610
 2013-09-14 13:55:23 +02:00
Marc Alexander
bd4664807f [feature/passwords] Increase code coverage in bcrypt driver 
PHPBB3-11610
 2013-09-14 13:55:18 +02:00
Marc Alexander
3a776ed0af [feature/passwords] Increase test coverage of salted_md5 driver 
PHPBB3-11610
 2013-09-14 13:55:13 +02:00
Marc Alexander
05a5ac282d [feature/passwords] Fix incorrect call to helper instead of $this 
The driver helper method unique_id is called inside the helper. Therefore,
it shouldn't be called via $this->helper but rather via $this.

PHPBB3-11610
 2013-09-14 13:55:06 +02:00
Marc Alexander
b6473a515b [feature/passwords] Increase manager test coverage to cover all methods 
All methods in the manager are now fully covered.

PHPBB3-11610
 2013-09-14 13:55:00 +02:00
Marc Alexander
a4b0a8ceb9 [feature/passwords] Do not use specific errors but just return false 
The authentication system should handle the possible errors for now.
Additional error returns can be added later on if they are needed.

PHPBB3-11610
 2013-09-14 13:54:53 +02:00