Commit graph

21038 commits

Author SHA1 Message Date
Joas Schilling
ea7d897e83 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
2014-04-16 00:19:10 +02:00
Joas Schilling
c4e3cc0850 Merge pull request #2301 from rxu/ticket/12401
[ticket/12401] Add $topic_data array to core.viewtopic_modify_post_row event

* rxu/ticket/12401:
  [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
2014-04-16 00:17:31 +02:00
Cesar G
a9fbc34cf4 [ticket/12201] Decreased pagination font size.
PHPBB3-12201
2014-04-15 15:14:47 -07:00
Cesar G
e174e29b41 [ticket/12201] Update select element to follow same design as prosilver.
PHPBB3-12201
2014-04-15 15:10:15 -07:00
Joas Schilling
cc776333a4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12400] Add viewforum event to modify topics data
2014-04-16 00:03:37 +02:00
Joas Schilling
07442211b9 Merge pull request #2300 from rxu/ticket/12400
[ticket/12400] Add viewforum event to modify topics data

* rxu/ticket/12400:
  [ticket/12400] Add viewforum event to modify topics data
2014-04-16 00:03:20 +02:00
Cesar G
ccadda530d [ticket/12201] Increase sort font size just slightly.
PHPBB3-12201
2014-04-15 15:00:34 -07:00
Andreas Fischer
8451d96ef8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-16 00:00:04 +02:00
Andreas Fischer
41db97ad3a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:56 +02:00
Andreas Fischer
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
2014-04-16 00:55:05 +03:00
Joas Schilling
97bf3d368f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:58 +02:00
Joas Schilling
d1f96aa036 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:44 +02:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:26 +02:00
Cesar G
b73e22ae71 [ticket/12201] Add link to resync file stats after error.
PHPBB3-12201
2014-04-15 14:19:47 -07:00
Oliver Schramm
7824535839 [ticket/11978] Fix width of topic search text field
PHPBB3-11978
2014-04-15 23:18:41 +02:00
Cesar G
52251acefa [ticket/12201] Fix typos in language pack.
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
38775fc063 [ticket/12201] Display error and sorting options when there are no attachments
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
01464e2451 [ticket/12201] Only the top pagination should be floated to the right.
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
f78d4196ea [ticket/12201] Rearrange pagination, sorting, and submit elements.
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
609c4efff6 [ticket/12201] Center the file size and mark columns.
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
efe667130d [ticket/12201] Separate pagination from table.
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Joas Schilling
f6ae3959a0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12344] Add core.pm_submit_before to function submit_pm
2014-04-15 22:25:58 +02:00
Joas Schilling
c63b5275d8 Merge branch 'ticket/lucifer4o/12344' into develop-ascraeus
* ticket/lucifer4o/12344:
  [ticket/12344] Add core.pm_submit_before to function submit_pm
2014-04-15 22:25:43 +02:00
lucifer4o
84c8c61eb2 [ticket/12344] Add core.pm_submit_before to function submit_pm
PHPBB3-12344
2014-04-15 22:19:47 +02:00
Oliver Schramm
f3cd7f73e1 [ticket/10423] Replace foreach with function in viewtopic.php
PHPBB3-10423
2014-04-15 20:43:16 +02:00
Oliver Schramm
601ecd3da1 [ticket/10423] Remove unnecessary include in test
PHPBB3-10423
2014-04-15 20:43:01 +02:00
Andreas Fischer
6f375d4615 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12388] Add tests for lang() use on log actions without data
  [ticket/12388] Fix translation of log entries without additional log data
2014-04-15 11:39:15 +02:00
Andreas Fischer
7d4be1fe19 Merge pull request #2286 from nickvergessen/ticket/12388
[ticket/12388] Fix translation of log entries without additional log data

* nickvergessen/ticket/12388:
  [ticket/12388] Add tests for lang() use on log actions without data
  [ticket/12388] Fix translation of log entries without additional log data
2014-04-15 11:38:21 +02:00
Marc Alexander
c6fd2f01eb [ticket/8960] Allow changing avatar path if it's not writable
This change will allow users to change the avatar path even if it's not
writable. However, this will get rid of the error message that the path is
not writable. Due to this, a minor addition to the explain message in the ACP
settings has been made.

PHPBB3-8960
2014-04-14 22:44:37 +02:00
PayBas
1c72e97bc8 [ticket/12347] Changed from :after to :before
PHPBB3-12347
2014-04-14 20:57:22 +02:00
Joas Schilling
91eaae122f [ticket/12382] Mark broken nested loop with include as incomplete
PHPBB3-12382
2014-04-14 18:56:34 +02:00
n-aleha
11c4d14a9b [ticket/12391] Assign variables to core.posting_modify_template_vars
Assign variables to event "core.posting_modify_template_vars".
Also, fix a couple of typos.

PHPBB3-12391
2014-04-14 14:37:21 +03:00
Joas Schilling
3247af1677 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12004] Support empty routes to app.php/ in path_helper
2014-04-14 12:41:06 +02:00
Joas Schilling
b487da7c05 Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeus
* marc/ticket/12004:
  [ticket/12004] Support empty routes to app.php/ in path_helper
2014-04-14 12:40:47 +02:00
Joas Schilling
c88b2f89e9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
2014-04-14 12:33:46 +02:00
Joas Schilling
aebf2cc5cd Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus
* marc/ticket/12372:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
2014-04-14 12:33:33 +02:00
n-aleha
6584f5eba6 [ticket/12191] Move notification options to bottom while installing
Move "ucp>board preferences>edit notification options" to bottom while
installing.

PHPBB3-12191
2014-04-14 00:02:28 +03:00
Joas Schilling
7f0d2bfe66 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12398] Select correct post to restore during softdelete tests
2014-04-13 22:42:55 +02:00
Joas Schilling
3ce479f061 Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus
* marc/ticket/12398:
  [ticket/12398] Select correct post to restore during softdelete tests
2014-04-13 22:42:45 +02:00
Marc Alexander
ad1513cde9 [ticket/12398] Select correct post to restore during softdelete tests
PHPBB3-12398
2014-04-13 22:22:55 +02:00
Oliver Schramm
dde7ac3b2b [ticket/10423] Match multiple wildcards
Multiple wildcards are removed from the string if there is
no word before or after them. If there is a word before or
after them, they are just replaced with a single one.

PHPBB3-10423
2014-04-13 21:36:09 +02:00
Oliver Schramm
face175471 [ticket/10423] Move code into a function and add tests for it
PHPBB3-10423
2014-04-13 21:15:14 +02:00
rxu
62a729e85e [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
$topic_data array is used in viewtopic.php to populate $post_row template
block array data. Although $topic_data is not being passed
to core.viewtopic_modify_post_row event for modifying/adding
$post_row data in it. So, pass this array to the event.
Also, total_posts is added.

PHPBB3-12401
2014-04-13 23:13:55 +08:00
rxu
e6a4633b51 [ticket/12400] Add viewforum event to modify topics data
The event allows extensions to use and/or modify topics list and/or
topics data before dumping out the viewforum page.
For extensions which operate with viewforum page, f.e. if the topics list
and data is needed to retrieve, add, modify additional topics info
before the output loop.

PHPBB3-12400
2014-04-13 22:51:24 +08:00
Joas Schilling
845a052318 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12398] Use return of submit_post in softdelete and download tests
  [ticket/12398] Use submit_post return in prune_shadow_topic_test
2014-04-12 16:45:55 +02:00
Joas Schilling
cbc1c4bf31 Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus
* marc/ticket/12398:
  [ticket/12398] Use return of submit_post in softdelete and download tests
  [ticket/12398] Use submit_post return in prune_shadow_topic_test
2014-04-12 16:45:30 +02:00
Joas Schilling
8d012197f4 [ticket/12390] Remove documentation, tests and other files from vendor/
PHPBB3-12390
2014-04-12 16:35:20 +02:00
Marc Alexander
5124920d22 [ticket/12398] Use return of submit_post in softdelete and download tests
PHPBB3-12398
2014-04-12 14:36:05 +02:00
Marc Alexander
bd31ebd287 [ticket/12398] Use submit_post return in prune_shadow_topic_test
This should get rid of possible failures during functional tests.

PHPBB3-12398
2014-04-12 14:34:16 +02:00