1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

16032 Commits

Author SHA1 Message Date
Andreas Fischer
c4f8c64a23 [ticket/11122] Add EXreaction to docs/AUTHORS.
PHPBB3-11122
2013-02-24 12:37:02 +01:00
Nathaniel Guse
f6a894f077 [feature/migrations] Use the user class for language handling
Also localise error messages from the migrator

PHBB3-9737
2013-02-23 16:12:24 -06:00
Nathaniel Guse
4bf64b5e38 [feature/migrations] Fully revert the removal of the user_msnm field
PHBB3-9737
2013-02-23 15:10:21 -06:00
Nathaniel Guse
c31935abda [feature/migrations] Revert unrelated change to schema_data.sql
PHBB3-9737
2013-02-23 15:08:28 -06:00
Nathaniel Guse
213bc09743 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data
Conflicts:
	phpBB/install/database_update.php
2013-02-23 15:05:47 -06:00
David King
b7a222cdd5 [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
PHPBB3-11298
2013-02-23 14:20:56 -05:00
David King
6e1e62a77d Merge remote-tracking branch 'EXreaction/feature/migrations-extensions' into develop
# By Nathaniel Guse (6) and Nathan Guse (3)
# Via Nathan Guse (1) and Nathaniel Guse (1)
* EXreaction/feature/migrations-extensions:
  [feature/migrations] Use getLocalisedMessage() function to get error message
  [feature/migrations] Fix failing tests (again)
  [feature/migrations] Fix failing tests
  [feature/migrations] Catch and display errors from the migrator
  [feature/migrations] Call revert correctly when purging an extension
  [feature/migrations] Inject Migrator instead of using the container to fetch
  [feature/migrations] Fix path to extension migrations
  [feature/migrations] Automatically install/revert migrations for extensions
  [feature/migrations] Make the container available to extension installers
2013-02-23 14:08:48 -05:00
David King
0987efa189 Merge remote-tracking branch 'EXreaction/ticket/11351' into develop
# By Nathaniel Guse (4) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11351:
  [feature/migrations] getLocalisedMessage function for migration exception
  [feature/migrations] Fix unfulfillable function
  [feature/migrations] getParameters function for migration exception
  [feature/migrations] Add explanatory language string for migration errors
  [feature/migrations] Add language strings for migrations errors
2013-02-23 13:50:53 -05:00
Andreas Fischer
ae3a22bd0c [ticket/11361] Make sure that array passed to strtr() has the proper format.
The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array
which results in an E_NOTICE being thrown for 'Array to string conversion' on
PHP 5.4.
Ensure that the array passed to strtr() is one-dimensional by filtering out
non-string values.

PHPBB3-11361
2013-02-23 11:06:48 +01:00
Marc Alexander
37093b6aa5 [ticket/11342] Fix "unexpected token" syntax error
PHPBB-11342
2013-02-20 23:19:25 +01:00
Marc Alexander
3cc4746ad3 [feature/avatars] Use "Main" as category for avatars in root of gallery
Before this change the whole avatar gallery path would show as category.
Additionally, the avatars that were selected like that had an incorrect
path and didn't show up correctly.
With this patch it'll display "Main" as category and properly work.

PHPBBB3-10018
2013-02-19 12:45:08 +01:00
Marc Alexander
a9e0aea4b1 [feature/avatars] Remove trailing whitespace from avatar code
PHPBB3-10018
2013-02-19 12:30:14 +01:00
Marc Alexander
2302cd7a42 [feature/avatars] Pass phpbb_user to prepare and process form functions
The phpbb_user object might be used for language variables and other
things.

PHPBB3-10018
2013-02-19 12:24:21 +01:00
Oleg Pudeyev
3e90082dbb Merge PR #1062 branch 'dhruvgoel92/ticket/11179' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11179:
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  [ticket/11179] fix success query path for postgres
  [ticket/11179] fix success query path for mysql
  [ticket/11179] minor fixes
  [ticket/11179] pass start param by reference in postgres
  [ticket/11179] correct start param in author search of postgres
  [ticket/11179] correct start parameter in psql keyword search
  [ticket/11179] pass start param by reference in author search
  [ticket/11179] correct start parameter for author search
  [ticket/11179] use FOUND_ROWS query to re-search with changed start param
  [ticket/11179] pass start parameter by reference
  [ticket/11179] correct the start parameter while retrieving from cache
  [ticket/11179] add search query in case initial one fails
2013-02-18 18:44:04 -05:00
Dhruv
1ee4702ec5 [ticket/11179] remove extra & in function call
PHPBB3-11179
2013-02-19 00:52:56 +05:30
Dhruv
38bb7dca31 [ticket/11179] correct start parameter in sphinx search
PHPBB3-11179
2013-02-19 00:52:55 +05:30
Dhruv
2ff874fe93 [ticket/11179] correct start parameter in native author search
PHPBB3-11179
2013-02-19 00:52:54 +05:30
Dhruv
a0ae223ef4 [ticket/11179] correct start parameter in native keyword search
PHPBB3-11179
2013-02-19 00:52:53 +05:30
Dhruv
8b7f306897 [ticket/11179] fix success query path for postgres
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
2013-02-19 00:52:52 +05:30
Dhruv
f0d63594e6 [ticket/11179] fix success query path for mysql
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
2013-02-19 00:52:51 +05:30
Dhruv
16bbdf4a52 [ticket/11179] minor fixes
Amends comments to start with capitals. Reinsert blank lines which were
not supposed to be removed

PHPBB3-11179
2013-02-19 00:52:50 +05:30
Dhruv
bc77ca4d4e [ticket/11179] pass start param by reference in postgres
PHPBB3-11179
2013-02-19 00:52:49 +05:30
Dhruv
ef88edbcf6 [ticket/11179] correct start param in author search of postgres
PHPBB3-11179
2013-02-19 00:52:48 +05:30
Dhruv
2cb48f0341 [ticket/11179] correct start parameter in psql keyword search
PHPBB3-11179
2013-02-19 00:52:47 +05:30
Dhruv
80f8e3abce [ticket/11179] pass start param by reference in author search
PHPBB3-11179
2013-02-19 00:52:46 +05:30
Dhruv
2601411a9c [ticket/11179] correct start parameter for author search
PHPBB3-11179
2013-02-19 00:52:45 +05:30
Dhruv
1c9c666ef1 [ticket/11179] use FOUND_ROWS query to re-search with changed start param
PHPBB3-11179
2013-02-19 00:52:44 +05:30
Dhruv
3e5ef8ab2c [ticket/11179] pass start parameter by reference
start parameter is passed by reference so that in case it is not in bounds
the changes made to it are reflected back to the phpBB/search.php file

PHPBB3-11179
2013-02-19 00:52:43 +05:30
Dhruv
00d34617cc [ticket/11179] correct the start parameter while retrieving from cache
Start parameter if not between 0 and the total result count of the cached
search results is changed accordingly

PHPBB3-11179
2013-02-19 00:52:42 +05:30
Dhruv
737b99966d [ticket/11179] add search query in case initial one fails
changes the start parameter according to the total search results and
executes the search query again to get the results.

PHPBB3-11179
2013-02-19 00:52:41 +05:30
Oleg Pudeyev
0f89b48820 Merge PR #1236 branch 'dhruvgoel92/ticket/11359' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11359:
  [ticket/11359] html escape sphinx config data
  [ticket/11359] add id attribute to textarea
  [ticket/11359] close span
2013-02-18 04:34:26 -05:00
Dhruv
38360c71f2 [ticket/11359] html escape sphinx config data
PHPBB3-11359
2013-02-18 14:13:31 +05:30
Dhruv
3c6256b3e7 [ticket/11359] add id attribute to textarea
PHPBB3-11359
2013-02-18 14:05:25 +05:30
Dhruv
5b99f0c113 [ticket/11359] close span
PHPBB3-11359
2013-02-18 14:01:46 +05:30
Nathan Guse
872773a218 [feature/migrations] Use getLocalisedMessage() function to get error message
PHPBB3-11318
2013-02-15 22:22:13 -06:00
Nathan Guse
f6bb14569b [feature/migrations] getLocalisedMessage function for migration exception
PHPBB3-11351
2013-02-15 22:19:24 -06:00
Nathan Guse
d2295b3d1f [ticket/11103] Restore new/unread messages info/link in header (properly)
PHPBB3-11103
2013-02-15 19:27:09 -06:00
Matt Friedman
337b958171 [ticket/11103] Add newlines to bottom of css file
PHPBB3-11103
2013-02-15 14:39:06 -08:00
Matt Friedman
b05da5ec0e [ticket/11103] HTML encode double arrow character
PHPBB3-11103
2013-02-15 14:38:36 -08:00
Nathan Guse
7ad577a86a [ticket/11103] Add Notification Settings link in flyout menu
PHPBB3-11103
2013-02-15 16:02:33 -06:00
Nathan Guse
cdc766c90f [ticket/11103] Restore new/unread messages info/link in header
PHPBB3-11103
2013-02-15 15:41:34 -06:00
Matt Friedman
fdc9ad76ce [ticket/11103] Update styling of UCP Notifications in subsilver2
PHPBB3-11103
2013-02-14 11:01:15 -08:00
Matt Friedman
fd4e197bde [ticket/11103] Update styling of UCP Notifications in prosilver
PHPBB3-11103
2013-02-14 11:00:59 -08:00
Matt Friedman
93619c0a4b [ticket/11103] Update styling of subsilver2 notification modal
PHPBB3-11103
2013-02-14 11:00:11 -08:00
Matt Friedman
3ba25289aa [ticket/11103] Update styling of prosilver notification modal
PHPBB3-11103
2013-02-14 10:59:39 -08:00
Matt Friedman
216dc82486 [ticket/11103] Remove title attribute from notification link
PHPBB3-11103
2013-02-14 10:55:30 -08:00
Nathaniel Guse
193a3beb8f [feature/migrations] Fix failing tests (again)
PHPBB3-11318
2013-02-13 21:41:52 -06:00
Nathaniel Guse
283ef6eed4 [ticket/11103] Mark/Unmark All buttons
PHPBB3-11103
2013-02-13 17:20:25 -06:00
Nathaniel Guse
dc9cfcd613 [ticket/11103] Make the number of notifications strong if > 0
PHPBB3-11103
2013-02-13 13:30:05 -06:00
Marc Alexander
f09e6865f7 [feature/avatars] Document the use of the allowed extensions array
PHPBB3-10018
2013-02-13 01:07:02 +01:00