mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-17 09:46:25 +02:00
Code Issues Releases Wiki Activity
16,253 Commits 10 Branches 193 Tags
f8ffe849690b2c9aa7ee446e404c52a880ad74d6
Commit Graph

14699 Commits

Author SHA1 Message Date
Nils Adermann
f8ffe84969 Merge pull request #1366 from asperous/ticket/11129 
[ticket/11129] Added headers to empty subscription state
 2013-04-24 10:29:50 -07:00
Nils Adermann
b8c2bf6ce4 Merge remote-tracking branch 'github-asperous/ticket/9975' into develop 
* github-asperous/ticket/9975:
  [ticket/9975] Moved a few E_USER_ERROR errors to /language

Conflicts:
	phpBB/includes/user.php
 2013-04-24 19:16:46 +02:00
Nils Adermann
b3497d955f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9975] Translate missing style error message

Conflicts:
	phpBB/includes/session.php
 2013-04-24 19:13:47 +02:00
Nils Adermann
aaf109e07d Merge pull request #1326 from dhruvgoel92/ticket/11485 
[ticket/11485] add columns to update_schema before adding data
 2013-04-24 09:59:41 -07:00
Nils Adermann
81daf21dc0 Merge pull request #1324 from nickvergessen/ticket/10844-2 
Ticket/10844 Extensions are not located when front-end file has a diffferent phpbb_root_path
 2013-04-24 09:52:57 -07:00
Nils Adermann
3e32655c7f Merge pull request #1290 from nickvergessen/ticket/11362 
Correctly sanitise the directory path in finder
 2013-04-24 09:45:34 -07:00
asperous
0f41cc34dd [ticket/11129] Added headers to empty subscription state 
Added a newline to better seperate the two headers.

PHPBB3-11129
 2013-04-23 15:02:38 -07:00
asperous
51a869b13a [ticket/11129] Added headers to empty subscription state 
"You are not subscribed to any forums".
While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections.
As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header.

PHPBB3-11129
 2013-04-23 11:27:36 -07:00
asperous
9f545a7f6b [ticket/9975] Moved a few E_USER_ERROR errors to /language 
There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.

PHPBB3-9975
 2013-04-23 09:55:36 -07:00
Joas Schilling
16e70fa086 [ticket/11362] Use container when available instead of creating a new instance 
PHPBB3-11362
 2013-04-22 00:49:41 +02:00
Gaëtan Muller
802fbbb444 [ticket/9975] Translate missing style error message 
The error message about missing style data was not
translated

PHPBB3-9975
 2013-04-21 17:38:49 +02:00
Joas Schilling
db5df5b6ac [ticket/10966] Introduce MSSQL base class for native and ODBC 
PHPBB3-10966
 2013-04-19 19:11:22 +02:00
Joas Schilling
ccd4a725da [ticket/11362] Add compatibility function phpbb_clean_path() again 
The function first depends on the container, but also works without it and
without autoload. The reason for this is, it might be used before that
stuff is set up, like it has been in our common.php

PHPBB3-11362
 2013-04-18 09:53:02 +02:00
Joas Schilling
e2875a7e17 [ticket/10966] Introduce MySQL base class 
PHPBB3-10966
 2013-04-17 21:25:35 +02:00
Joas Schilling
ffe9f2a93e [ticket/11362] Fix service description of finder 
PHPBB3-11362
 2013-04-17 20:25:30 +02:00
Joas Schilling
423b310e2a [ticket/11362] Extension manager depends on filesystem 
PHPBB3-11362
 2013-04-17 18:43:19 +02:00
Joas Schilling
d7fb934a2f [ticket/11362] Replace other calls to phpbb_clean_path 
Need to instantiate the object manually here, as the container is not yet
set up.

PHPBB3-11362
 2013-04-17 17:53:44 +02:00
Joas Schilling
158bce0209 [ticket/11362] Use new filesystem class in finder 
PHPBB3-11362
 2013-04-17 17:50:44 +02:00
Joas Schilling
869e00a23b [ticket/11362] Move phpbb_clean_path into a simple filesystem service 
PHPBB3-11362
 2013-04-17 17:46:58 +02:00
Marc Alexander
c1dedabdfb [ticket/11488] Use correct base class in email notification method 
In ticket/11451 this was not correctly changed to reflect the new class
phpbb_notifcation_method_messenger_base. Additionally, an undefined
variable error has been fixed in messenger_base.php (change should be
confirmed by bantu though).

PHPBB3-11488
 2013-04-15 12:50:21 +02:00
Andreas Fischer
ec33bada93 Merge remote-tracking branch 'hjpotter92/ticket/11225' into develop 
* hjpotter92/ticket/11225:
  [ticket/11225] Deletion of unused mcp_jumpbox.html file
 2013-04-13 00:23:22 -04:00
Joas Schilling
bbaa3411b0 [ticket/10844] Make sure ext_path has no trailing slash 
PHPBB3-10844
 2013-04-12 21:35:07 +02:00
Joas Schilling
6a3d77d76e [ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_provider 
The phpbb_root_path needs to be removed from the style path, before giving
the path to the finder, because the finder prepends it later again and is
therefor unable to find style files when the root path is not ./

PHPBB3-10844
 2013-04-12 21:35:06 +02:00
Nils Adermann
c25dfef770 Merge pull request #1184 from marc1706/ticket/11314 
[ticket/11314] Improve readability and code cleanup in new JavaScript files
 2013-04-12 06:32:13 -07:00
Nils Adermann
653666c76e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11358] Removed all trailing white spaces.
  [ticket/11358] Fixed the code according to coding guidlines.
 2013-04-12 14:03:56 +02:00
Nils Adermann
0ce94fde77 Merge branch 'ticket/11358' into develop-olympus 
* ticket/11358:
  [ticket/11358] Removed all trailing white spaces.
  [ticket/11358] Fixed the code according to coding guidlines.
 2013-04-12 14:03:24 +02:00
erangamapa
7d8bbcd596 [ticket/11358] Removed all trailing white spaces. 
Removed all trailing white spaces with new lines.

PHPBB3-11358
 2013-04-12 14:03:06 +02:00
erangamapa
00b45fa4dc [ticket/11358] Fixed the code according to coding guidlines. 
Added proper indentation and new line after break in switch
statement.

PHPBB3-11358
 2013-04-12 14:02:51 +02:00
Andreas Fischer
d071d57a1b Merge remote-tracking branch 'rechosen/ticket/11116' into develop 
* rechosen/ticket/11116:
  [ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
 2013-04-11 15:18:29 -04:00
Joas Schilling
1296417b52 [ticket/11492] Initialize $user_ids and $group_users arrays 
Also avoid unneccessary calls to permissions when user_ids is empty

PHPBB3-11492
 2013-04-11 16:38:14 +02:00
rechosen
694eb3ccb5 [ticket/11116] Made ACP "extension not available" error message E_USER_WARNING 
The error message generated when an administrator tries to enable an
incompatible extension used to be displayed in the green of the default
E_USER_NOTICE. Changed it to E_USER_WARNING to make it appear in red, as
requested in the ticket.

PHPBB3-11116
 2013-04-11 13:13:50 +02:00
hjpotter92
effc8a9bd0 [ticket/11225] Deletion of unused mcp_jumpbox.html file 
The file/template is no longer used(as mentioned in it).

PHPBB3-11225
 2013-04-11 00:00:48 +05:30
Dhruv
5a4438d486 [ticket/11485] add revert_schema for the updated columns 
PHPBB3-11485
 2013-04-09 15:39:26 +05:30
Dhruv
7c261f64dc [ticket/11485] add columns to styles table during updating schema before 
updating the data

PHPBB3-10485
 2013-04-09 15:39:17 +05:30
Nils Adermann
52a0f32d99 Merge pull request #1312 from VSEphpbb/ticket/11463 
[ticket/11463] Add title attribute to topics in search results
 2013-04-04 01:39:37 -07:00
Nils Adermann
3985bdbc1b Merge pull request #1199 from imkingdavid/ticket/11334 
[ticket/11334] Properly generate controller URL with helper url() method
 2013-04-03 06:44:15 -07:00
Nils Adermann
a7cf2bdace Merge pull request #1323 from t-backoff/ticket/11477 
Ticket/11477
 2013-03-31 15:57:26 -07:00
Tabitha Backoff
5d669ed1c5 Changing effectively_installed function to check if the config var is set. 2013-03-31 18:46:25 -04:00
Nils Adermann
78dc1c84c8 Merge pull request #1316 from nickvergessen/ticket/11405 
Ticket/11405 Users that are subscribed to a forum, should receive notifications for new replies
 2013-03-31 15:02:48 -07:00
Nils Adermann
8ae2ea68a6 Merge pull request #1311 from VSEphpbb/ticket/11461 
[ticket/11461] - Template Event added to bottom of view topic pages
 2013-03-31 14:57:51 -07:00
Nils Adermann
8231b881ad Merge pull request #1287 from erangamapa/ticket/11106 
[ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
 2013-03-31 14:54:23 -07:00
Nils Adermann
fd7db5cc1f Merge pull request #1296 from bantu/ticket/11440 
[ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
 2013-03-31 14:42:43 -07:00
Nils Adermann
133307b6bf Merge pull request #1300 from bantu/ticket/11451 
[ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
 2013-03-29 08:58:40 -07:00
Andreas Fischer
b156b22f35 [ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead. 
PHPBB3-11403
 2013-03-29 16:53:50 +01:00
Andreas Fischer
6910d44154 [ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches. 
PHPBB3-11403
 2013-03-29 16:37:04 +01:00
Nils Adermann
1b71779432 Merge pull request #1285 from EXreaction/ticket/11422 
[ticket/11422] Increment assets when database_update is complete
 2013-03-29 08:29:22 -07:00
Tabitha Backoff
a8f5695666 Migration file and change board_home_text to board_index_text 2013-03-28 17:53:14 -04:00
Tabitha Backoff
9e5cde7f66 Ticket# 11477 - Allow customisation of "Board index" 2013-03-28 02:34:36 -04:00
Andreas Fischer
4bd5f279dc [ticket/11469] Add comment about using bitwise operator. 
PHPBB3-11469
 2013-03-28 00:28:51 +01:00
Andreas Fischer
1bd13acb75 [ticket/11469] Use multi insert property from DB. Do not copy value to buffer. 
PHPBB3-11469
 2013-03-28 00:28:50 +01:00