Nathaniel Guse
12c2258506
[ticket/11628] Remove template_path option on set_custom_style
...
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)
PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be
[ticket/11628] Remove set_style_names function, moved to set_custom_style
...
PHPBB3-11628
2013-07-24 13:19:20 -05:00
Nathaniel Guse
4b761f6575
[ticket/11628] Remove third parameter ($names) from set_custom_style
...
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument
PHPBB3-11628
2013-07-24 12:56:39 -05:00
Nathaniel Guse
5d1afb4532
[ticket/11628] Remove phpbb_style (move methods to phpbb_template)
...
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Nathaniel Guse
44a82dd083
[ticket/11628] Remove style path provider
...
No longer used since Twig was implemented.
PHPBB3-11628
2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c
[ticket/11628] Remove style resource locator
...
No longer used since Twig was implemented.
PHPBB3-11628
2013-07-24 11:59:21 -05:00
Andreas Fischer
c2d919f12d
Merge remote-tracking branch 'asperous/ticket/11731' into develop
...
* asperous/ticket/11731:
[ticket/11731] Remove static calls to captcha garbage collector
2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2
[ticket/11731] Remove static calls to captcha garbage collector
...
PHPBB3-11731
2013-07-22 15:04:30 -07:00
Nathan Guse
127ee62edd
Merge pull request #1589 from marc1706/ticket/11717
...
[ticket/11717] Use topic_posts_approved instead of topic_replies
2013-07-22 12:20:17 -07:00
Nathan Guse
b71038486e
Merge pull request #1513 from nickvergessen/ticket/11582
...
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Joas Schilling
0f70864624
[ticket/11582] Move global declaration to beginning of block
...
PHPBB3-11582
2013-07-22 20:06:30 +02:00
Marc Alexander
effafa4b4d
[ticket/11717] Add 'has' to boolean variable and reduce line length
...
PHPBB3-11717
2013-07-22 10:42:46 +02:00
Marc Alexander
603dc1f786
[ticket/11717] Use topic_posts_approved instead of topic_replies
...
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.
PHPBB3-11717
2013-07-20 21:21:36 +02:00
Marc Alexander
f421c082f7
[ticket/11713] Do not remove module if it couldn't be deleted
...
Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.
PHPBB3-11713
2013-07-18 22:41:23 +02:00
Joas Schilling
9c72bbe284
[ticket/11582] Move file to new directory
...
PHPBB3-11582
2013-07-14 12:04:04 -04:00
Joas Schilling
060754fd6c
[ticket/11582] Fix missing closing bracket
...
PHPBB3-11582
2013-07-14 12:02:47 -04:00
Joas Schilling
4b7b7e895b
[ticket/11582] Fix missing @params in the doc blocks
...
PHPBB3-11582
2013-07-14 12:02:46 -04:00
Joas Schilling
aaa44eda2b
[ticket/11582] Remove useless prefix
...
PHPBB3-11582
2013-07-14 12:02:44 -04:00
Joas Schilling
0e86c02473
[ticket/11582] Split permission language strings from logic
...
PHPBB3-11582
2013-07-14 12:02:38 -04:00
Joas Schilling
aadff800dc
[ticket/11582] Remove left over calls to lang['acl_*']
...
PHPBB3-11582
2013-07-14 11:51:39 -04:00
Joas Schilling
22ba3de1a2
[ticket/11582] Use member isntead of a new variable everytime
...
PHPBB3-11582
2013-07-14 11:51:37 -04:00
Joas Schilling
9c653341e4
[ticket/11582] Use new methods and remove duplicated entries
...
PHPBB3-11582
2013-07-14 11:51:36 -04:00
Joas Schilling
ce0a182c7f
[ticket/11582] Add methods to return the language string
...
PHPBB3-11582
2013-07-14 11:51:34 -04:00
Joas Schilling
7f9a1c8116
[ticket/11582] Add event in constructor and add docs
...
PHPBB3-11582
2013-07-14 11:51:33 -04:00
Joas Schilling
137cec5895
[ticket/11582] Fix event dispatcher class name
...
PHPBB3-11582
2013-07-14 11:51:32 -04:00
Joas Schilling
e8d2a2fd88
[ticket/11582] Use new class for categories
...
PHPBB3-11582
2013-07-14 11:51:30 -04:00
Joas Schilling
573987d2d2
[ticket/11582] Add new service for permissions
...
Replace calls to the language-array type with a call to get_types()
PHPBB3-11582
2013-07-14 11:51:29 -04:00
Joas Schilling
f302cbe175
[ticket/11696] Move file to new directory
...
PHPBB3-11696
2013-07-14 10:16:15 -04:00
Joas Schilling
131194d216
[ticket/11696] Rename constructor to __construct()
...
PHPBB3-11696
2013-07-14 10:12:49 -04:00
Joas Schilling
057d860d07
[ticket/11696] Rename db_tools.php so it can be autoloaded
...
PHPBB3-11696
2013-07-14 10:10:05 -04:00
Nils Adermann
7030578bbe
[ticket/11698] Moving all autoloadable files to phpbb/
...
PHPBB3-11698
2013-07-14 01:32:34 -04:00
Nils Adermann
4186c05bb4
Merge pull request #1555 from EXreaction/ticket/11692
...
[ticket/11692] Don't update search_type in dev migration if already appended
2013-07-13 20:53:48 -07:00
Vjacheslav Trushkin
8d30322635
[ticket/11694] Do not locate assets with root path
...
Do not locate assets that start with ./
PHPBB3-11694
2013-07-13 23:15:26 -04:00
Nathaniel Guse
176729ab00
[ticket/11692] Don't update search_type in dev migration if already appended
...
PHPBB3-11692
2013-07-13 17:50:35 -05:00
Nils Adermann
9f5ee08bae
[ticket/11690] Old module class names may get autoloaded by class_exists
...
PHPBB3-11690
2013-07-13 16:47:25 -04:00
Nathan Guse
ea0ef00801
Merge pull request #1550 from nickvergessen/ticket/9649
...
[ticket/9649] Display information on index for moderators on unapproved posts
2013-07-13 12:03:33 -07:00
Joas Schilling
081350678d
[ticket/9649] Display information on index for moderators on unapproved posts
...
PHPBB3-9649
2013-07-13 14:57:31 -04:00
Nathan Guse
e10cbbf023
Merge pull request #1541 from nickvergessen/ticket/11684
...
[ticket/11684] Remove useless confirmation page after login and admin login
2013-07-13 10:38:24 -07:00
Nathan Guse
b6c3939c32
Merge pull request #1543 from nickvergessen/ticket/11685
...
[ticket/11685] Remove logout confirmation page
2013-07-13 10:37:43 -07:00
Vjacheslav Trushkin
c1bb179914
[ticket/10999] Fix assets_version in ACP
...
PHPBB3-10999
2013-07-13 13:30:33 -04:00
Nils Adermann
0ef95a7009
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
2013-07-13 13:16:58 -04:00
Nils Adermann
0341555314
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
2013-07-13 13:14:48 -04:00
Joas Schilling
8f95ef55a6
[ticket/11685] Remove logout confirmation page
...
PHPBB3-11685
2013-07-13 12:27:00 -04:00
Joas Schilling
7d0c1d02ca
[ticket/11684] Remove useless confirmation page after login and admin login
...
PHPBB3-11684
2013-07-13 12:02:49 -04:00
Nathan Guse
87795eba55
Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission
...
Soft delete
2013-07-13 08:57:20 -07:00
Nathan Guse
d879acb7cc
Merge pull request #1519 from cyberalien/ticket/11647
...
Fix INCLUDEJS URLs handling
2013-07-13 08:46:46 -07:00
Joas Schilling
1584fdd26d
Merge remote-tracking branch 'EXreaction/ticket/11420' into develop
...
* EXreaction/ticket/11420:
[ticket/11420] Fix tests
[ticket/11420] Fix tests
[ticket/11420] Fix tests
[ticket/11420] Use !==, === when comparing strings
[ticket/11420] Fix comments, license link
[ticket/11420] Rename migrations file to something more helpful
[ticket/11420] Forgot to include mock sql_insert_buffer
[ticket/11420] Fix notification options conversion
2013-07-13 11:15:53 -04:00
Joas Schilling
6cde302ffa
[ticket/9657] Remove old code
...
PHPBB3-9657
2013-07-13 10:47:42 -04:00
Joas Schilling
8352a7cada
Merge remote-tracking branch 'phpbb/develop' into ticket/9657
...
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
2013-07-13 09:36:24 -04:00
Joas Schilling
28e3341fcd
[ticket/9657] Keep approval state of posts/topics when copying them
...
PHPBB3-9657
2013-07-13 00:54:39 -04:00