mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
18,981 Commits 17 Branches 190 Tags
Commit Graph

8160 Commits

Author SHA1 Message Date
Joas Schilling
0aed281676 [ticket/11997] Fix missing global 
PHPBB3-11997
 2013-11-13 11:30:41 +01:00
Joas Schilling
0a7db81426 [ticket/11997] Fix redirects from inside controllers 
The redirect url currently uses the web root path. However as we prepend the
full board url later, we need to remove the relative web root path and prepend
the normal root path again. Otherwise redirects from inside routes will not
work as intended.

PHPBB3-11997
 2013-11-13 11:30:13 +01:00
Marc Alexander
d43542a434 [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths 
PHPBB3-11997
 2013-11-12 00:46:43 +01:00
Marc Alexander
2d0fb4d166 [ticket/11997] Rename root_dirs_size to superordinate_dirs_count 
This variable name better fits what is done with it. A comment explaining
why 2 has to be subtracted from the size of root_dirs has also been added

PHPBB3-11997
 2013-11-11 21:55:21 +01:00
Marc Alexander
6bb9bce40e [ticket/11997] Remove obsolete if statement in phpbb_own_realpath() 
PHPBB3-11997
 2013-11-10 12:56:09 +01:00
Marc Alexander
60dda5577d [ticket/11997] Correctly redirect to front controllers 
We currently do a lot of checks in order to prevent users from getting to
a 404 page. However, this logic relies on checking if a file or folder exists.
Due to the front controllers and the URL rewriting in 3.1, it is no longer
possible to rely on existing files for redirecting. This patch will take
care of properly redirecting users to front controller files. An incorrect
link will cause users to get a 404 error though.

PHPBB3-11997
 2013-11-08 23:12:42 +01:00
Joas Schilling
bb0ff715f8 [ticket/11994] Change error level for missing .json file 
PHPBB3-11994
 2013-11-08 01:20:02 +01:00
Joas Schilling
f8e92efc3f [ticket/11994] Rename "uninstall" to "delete data" 
PHPBB3-11994
 2013-11-08 01:20:00 +01:00
Joas Schilling
7e1a02b3a1 [ticket/11994] Make install/enable just one UI thing 
PHPBB3-11994
 2013-11-08 01:19:59 +01:00
Joas Schilling
473402c77b [ticket/11994] Use display name on confirmation screen 
PHPBB3-11994
 2013-11-08 01:19:58 +01:00
Joas Schilling
8d5fcc8d4c [ticket/11994] Make extension manager UI less misleading 
Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.

PHPBB3-11994
 2013-11-08 01:19:54 +01:00
Dhruv
efe94e9c73 Merge remote-tracking branch 'nickvergessen/ticket/11973' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11973:
  [ticket/11973] Remove logic from tokens language array
 2013-11-04 00:11:23 +05:30
Patrick Webster
ad44407b19 [ticket/11990] Remove result_mssqlnative usage in acp_database.php 
The class result_mssqlnative was removed in ticket 11980. This removes
the dependency on that class from the database backup utility. It is
possible to use the sqlsrv functions to retrieve the field information,
but they must be then mapped back to type names. That mapping was removed
in 11980 and it is easier to just look it up in the information schema
table.

PHPBB3-11990
 2013-11-03 00:37:18 -05:00
Nathan Guse
25995e311c Merge pull request #1790 from prototech/ticket/11280 
[ticket/11280] Prevent duplicate entry in forums_track table.
 2013-11-02 12:10:19 -07:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746 
[ticket/11746] Add "admin activation required" notification.
 2013-11-02 11:55:16 -07:00
Joas Schilling
8a78699f6c Merge remote-tracking branch 'brunoais/ticket/11663' into develop 
* brunoais/ticket/11663:
  [ticket/11663] Add the doc block about the parameters.
  [ticket/11663] Add the doc block about the return value.
  [ticket/11663] Make generate_text_for_storage return the errors.
 2013-11-02 16:26:29 +01:00
Nils Adermann
158c998216 Merge pull request #1810 from nickvergessen/ticket/11031 
Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
 2013-11-02 07:20:15 -07:00
Joas Schilling
cb8cd50495 [ticket/11031] Correctly add groups to teampage 
PHPBB3-11031
 2013-11-02 13:25:46 +01:00
Marc Alexander
54b7b2320c [ticket/11983] Add missing argument to docblock in ucp_notifications 
The argument $subscriptions was not documented in the docblock of the method
output_notification_types() until now.

PHPBB3-11983
 2013-11-02 10:42:16 +01:00
Nils Adermann
e118b4f4c0 Merge pull request #1839 from bantu/task/code-sniffer 
More PHP Code Sniffer rules
 2013-11-01 07:58:18 -07:00
Cesar G
831075e5fe [ticket/11987] Add {ADMIN_ROOT_PATH}. 
PHPBB3-11987
 2013-10-30 16:13:20 -07:00
Cesar G
05dd4d55d2 [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}. 
PHPBB3-11987
 2013-10-30 15:43:07 -07:00
Cesar G
7251feab67 [ticket/11987] Change {ROOT_PATH} to point to board root. 
PHPBB3-11987
 2013-10-30 15:42:35 -07:00
Dhruv
a9524d6e08 Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
  [ticket/11974] Fix timezone names with underscores
  [ticket/11974] Translate all timezones
 2013-10-30 22:43:25 +05:30
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs. 
PHPBB3-11980
 2013-10-30 13:37:29 +01:00
Andreas Fischer
02e9f6e284 [task/code-sniffer] Fix argument list spacing. 
PHPBB3-11980
 2013-10-29 23:38:05 +01:00
Andreas Fischer
59e3c2d16e Merge remote-tracking branch 'marc1706/ticket/11981' into develop 
* marc1706/ticket/11981:
  [ticket/11981] Fix code sniffer complaints
 2013-10-29 00:00:00 +01:00
Joas Schilling
85a12ce4f4 [ticket/11031] Fix group legend position 
PHPBB3-11031
 2013-10-28 23:28:24 +01:00
Marc Alexander
7f58a4572e [ticket/11981] Fix code sniffer complaints 
PHPBB3-11981
 2013-10-28 23:05:46 +01:00
Nils Adermann
ed94e3c576 Merge pull request #1784 from nickvergessen/ticket/11924 
[Ticket/11924] Add a script to export the events in wiki format
 2013-10-28 14:53:59 -07:00
Joas Schilling
2086db0d7a [ticket/11974] Translate all timezones 
PHPBB3-11974
 2013-10-27 00:21:17 +02:00
Joas Schilling
6a87388e69 [ticket/11973] Remove logic from tokens language array 
Previously if a translator did no translate a token, it would not be
displayed. On the other hand, the translator could add additional tokens
which have no functionality.  Functionality is already hardcoded into
bbcode.php so we can that in the ACP aswell, in order to prevent namend
issues.

PHPBB3-11973
 2013-10-26 23:55:19 +02:00
Cesar G
c5fc8c43cb [ticket/11746] Delete the notification after user is approved & fix language. 
PHPBB3-11746
 2013-10-26 01:01:08 -07:00
Cesar G
d607f1c927 [ticket/11746] Add "admin activation required" notification. 
PHPBB3-11746
 2013-10-24 02:37:20 -07:00
Nils Adermann
a7e41b23fd Merge pull request #1801 from nickvergessen/ticket/11948 
Ticket/11948 Extensions should be allowed to have more then 1 routing file
 2013-10-22 00:29:20 -07:00
Joas Schilling
51561ed538 [ticket/11948] Allow resource importing for routing 
PHPBB3-11948
 2013-10-21 21:52:48 +02:00
Cesar G
c7b88ee1d1 [ticket/11923] Attempt to translate errors only if user can change avatar. 
PHPBB3-11923
 2013-10-17 21:29:02 -07:00
Cesar G
403da5d38d [ticket/11280] Prevent duplicate entry in forums_track table. 
Enforcing a time limit prevents all rows from being selected, thus a new row
is inserted resulting in a duplicate entry.

PHPBB3-11280
 2013-10-16 23:56:45 -07:00
Nathan Guse
852b707b48 Merge pull request #1781 from VSEphpbb/ticket/11921 
Ticket/11921 - Streamline PMs and Notifications in Header Link List
 2013-10-16 10:50:17 -07:00
Matt Friedman
ab8ac5e284 [ticket/11921] Directly inject unread messages count into the template 
PHPBB3-11921
 2013-10-16 10:26:33 -07:00
Matt Friedman
bd58c31ee0 [ticket/11921] Only get the count of unread PMs 
PHPBB3-11921
 2013-10-16 10:08:29 -07:00
Matt Friedman
2867831232 [ticket/11921] Move any HTML for Notifications to the templates 
PHPBB3-11921
 2013-10-16 10:07:54 -07:00
Joas Schilling
3c9a8a3788 [ticket/11924] Fix some minor issues with the php event docs 
PHPBB3-11924
 2013-10-16 16:32:40 +02:00
Matt Friedman
457ca9c763 [ticket/11921] Remove "l_" from non-lang variables 
PHPBB3-11921
 2013-10-15 14:09:47 -07:00
Joas Schilling
3bb93ab2d3 [develop] Update version to 3.1.0-a2-dev 2013-10-15 22:46:02 +02:00
Matt Friedman
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist 
PHPBB3-11921
 2013-10-15 10:29:15 -07:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload 
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
 2013-10-11 17:40:16 +02:00
Nils Adermann
446dc9b47e Merge pull request #1764 from EXreaction/ticket/11874 
[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
 2013-10-10 15:54:58 -07:00
Nathan Guse
ac9225774e [ticket/11874] Correct when $phpbb_root_path is appended to build_url() 
PHPBB3-11874
 2013-10-10 16:41:31 -05:00