Commit graph

19683 commits

Author SHA1 Message Date
Marc Alexander
db80091a66 Merge branch 'develop-ascraeus' into develop 2014-07-28 16:33:06 +02:00
Marc Alexander
63c938c703 Merge remote-tracking branch 'Nicofuma/ticket/12898' into develop-ascraeus 2014-07-28 16:32:27 +02:00
Tristan Darricau
f86bfeb3a1 [ticket/12898] Call garbage_collection() at the end of cron.php
PHPBB3-12898
2014-07-28 14:45:39 +02:00
Andreas Fischer
26ddd5a7fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12656] Fix typo for "purged extension"
  [ticket/12656] Fix syntax in language file
  [ticket/12656] Fix typo
  [ticket/12656] Use utf8 ’ instead of escaping '
  [ticket/12656] Use lang keys for all CLI strings
  [ticket/12656] Use lang keys for CLI command descriptions
2014-07-28 14:45:34 +02:00
Andreas Fischer
52e8a7231e Merge pull request #2772 from dhruvgoel92/ticket/12656
[ticket/12656] Translate existing CLI commands

* dhruvgoel92/ticket/12656:
  [ticket/12656] Fix typo for "purged extension"
  [ticket/12656] Fix syntax in language file
  [ticket/12656] Fix typo
  [ticket/12656] Use utf8 ’ instead of escaping '
  [ticket/12656] Use lang keys for all CLI strings
  [ticket/12656] Use lang keys for CLI command descriptions
2014-07-28 14:45:33 +02:00
Joas Schilling
577186db7a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12793] Tests (added and changed)
  [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw
  [ticket/12793] String '0' does not display for string profile fields
2014-07-27 20:12:13 +02:00
Joas Schilling
3df41920f7 Merge pull request #2718 from lucifer4o/ticket/12793
[ticket/12793] String '0' does not display for string profile fields

* lucifer4o/ticket/12793:
  [ticket/12793] Tests (added and changed)
  [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw
  [ticket/12793] String '0' does not display for string profile fields
2014-07-27 20:11:44 +02:00
Joas Schilling
b9b0c14855 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12791] Changed the if check
  [ticket/12791] String profile fields do not use links ...
2014-07-27 20:08:08 +02:00
Joas Schilling
8a6d3f2b1d Merge pull request #2719 from lucifer4o/ticket/12791
[ticket/12791] String profile fields do not use links ...

* lucifer4o/ticket/12791:
  [ticket/12791] Changed the if check
  [ticket/12791] String profile fields do not use links ...
2014-07-27 20:06:53 +02:00
Joas Schilling
82d9803aa8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12843] Fix Mark forums read browser console error
2014-07-27 19:51:47 +02:00
Joas Schilling
e94f24c821 Merge branch 'ticket/sumanai/12843' into develop-ascraeus
* ticket/sumanai/12843:
  [ticket/12843] Fix Mark forums read browser console error
2014-07-27 19:51:38 +02:00
Sumanai
ab8400a616 [ticket/12843] Fix Mark forums read browser console error
When you click on "Mark forums read" in the browser console error occurs
ReferenceError: assignment to undeclared variable phpbbAlertTimer
ajax.js (line13)

PHPBB3-12843
2014-07-27 19:50:48 +02:00
Joas Schilling
09d00afcc3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12884] Add core event to the function upload_attachment()
2014-07-27 19:45:12 +02:00
Joas Schilling
e226c99474 Merge pull request #2769 from rxu/ticket/12884
[ticket/12884] Add core event to the function upload_attachment()

* rxu/ticket/12884:
  [ticket/12884] Add core event to the function upload_attachment()
2014-07-27 19:45:07 +02:00
Joas Schilling
fdb756e633 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12896] Add php event for admin notices
2014-07-27 19:42:10 +02:00
Joas Schilling
64f2d778cd Merge branch 'ticket/forumhulp/12896' into develop-ascraeus
* ticket/forumhulp/12896:
  [ticket/12896] Add php event for admin notices
2014-07-27 19:41:56 +02:00
Forumhulp.com
5dcf56c98d [ticket/12896] Add php event for admin notices
PHPBB3-12896
2014-07-27 19:35:07 +02:00
Dhruv
8a046743bc [ticket/12656] Fix typo for "purged extension"
PHPBB3-12656
2014-07-27 14:56:12 +05:30
Andreas Fischer
2de19d1cef Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12883] Remove pointless comments
  [ticket/12883] Do not use basename() to get the search class in tidy_search
2014-07-26 22:52:08 +02:00
Andreas Fischer
a775bb082c Merge pull request #2768 from Nicofuma/ticket/12883
[ticket/12883] Do not use basename() to get the search class in tidy_search

* Nicofuma/ticket/12883:
  [ticket/12883] Remove pointless comments
  [ticket/12883] Do not use basename() to get the search class in tidy_search
2014-07-26 22:52:08 +02:00
Andreas Fischer
d4eec54686 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12881] Checks earlier if server-side topic marking is enabled
2014-07-26 22:50:07 +02:00
Andreas Fischer
155f709e36 Merge pull request #2777 from Nicofuma/ticket/12881
[ticket/12881] Debug error - Undefined index: mark_time

* Nicofuma/ticket/12881:
  [ticket/12881] Checks earlier if server-side topic marking is enabled
2014-07-26 22:50:06 +02:00
Tristan Darricau
af0c9d7a68 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop
2014-07-25 18:35:12 +02:00
Joas Schilling
831e9116ab [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop
We do not set S_NUM_ROWS while adding a row, to reduce the complexity
If we would set it on adding, each subsequent adding would cause
n modifications, resulting in a O(n!) complexity, rather then O(n)

PHPBB3-12892
2014-07-25 17:48:53 +02:00
Tristan Darricau
d9a62a7333 [ticket/12881] Checks earlier if server-side topic marking is enabled
PHPBB3-12881
2014-07-25 00:22:46 +02:00
Dhruv
f93559d013 Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12887] Fix Typo: offest -> offset
2014-07-24 19:03:20 +05:30
Dhruv Goel
8064d2931f Merge pull request #2773 from bantu/ticket/12887
[ticket/12887] Fix Typo: offest -> offset
2014-07-24 19:02:07 +05:30
Dhruv
ed9fb450de [ticket/12656] Fix syntax in language file
PHPBB3-12656
2014-07-24 18:56:52 +05:30
Marc Alexander
8f8605cee7 Merge branch 'develop-ascraeus' into develop 2014-07-24 11:01:14 +02:00
Marc Alexander
3cd7078900 Merge remote-tracking branch 'paybas/ticket/12857' into develop-ascraeus 2014-07-24 11:00:43 +02:00
Dhruv
6531856108 [ticket/12656] Fix typo
PHPBB3-12656
2014-07-24 01:12:40 +05:30
Dhruv
91b0e75cc7 [ticket/12656] Use utf8 ’ instead of escaping '
PHPBB3-12656
2014-07-24 01:08:31 +05:30
PayBas
1bd5edacb6 [ticket/12857] Add header/footer distinction for subsilver2 events
PHPBB3-12857
2014-07-23 16:09:12 +02:00
PayBas
5507c503b4 [ticket/12857] Clarify events.md on difference between PS and SS2 breadcrumbs
PHPBB3-12857
2014-07-23 10:37:44 +02:00
Andreas Fischer
b5c847c2ef [ticket/12887] Fix Typo: offest -> offset
PHPBB3-12887
2014-07-23 01:27:42 +02:00
Andreas Fischer
9e1802396f Merge pull request #2733 from n-aleha/ticket/12851
[ticket/12851] Fix the Font colour button title

* n-aleha/ticket/12851:
  [ticket/12851] Fix the Font colour button title
2014-07-23 01:12:18 +02:00
Andreas Fischer
f1890fe8e9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12851] Fix the Font colour button title
2014-07-23 01:12:18 +02:00
Tristan Darricau
3bf04d7152 [ticket/12883] Remove pointless comments
PHPBB3-12883
2014-07-23 00:30:55 +02:00
Dhruv
c81438e1f8 [ticket/12656] Use lang keys for all CLI strings
PHPBB3-12656
2014-07-23 01:23:44 +05:30
Dhruv
4092b63be3 [ticket/12656] Use lang keys for CLI command descriptions
PHPBB3-12656
2014-07-23 00:35:09 +05:30
Dhruv
25c646cbf9 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12560] Add methods to set upload and temp paths in plupload
2014-07-22 22:44:22 +05:30
Dhruv Goel
4a6a54472c Merge pull request #2766 from marc1706/ticket/12560
[ticket/12560] Add methods to set upload and temp paths in plupload
2014-07-22 22:42:05 +05:30
rxu
9485f59c61 [ticket/12884] Add core event to the function upload_attachment()
Add core event to the function upload_attachment()
in functions_posting.php to provide ability for extensions
to perform additional actions on uploaded files, like resizing etc.

PHPBB3-12884
2014-07-23 00:31:15 +08:00
Joas Schilling
cf88a6453c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
2014-07-21 22:40:55 +02:00
Joas Schilling
58d91d1d54 Merge pull request #2757 from rxu/ticket/12871
[ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation

* rxu/ticket/12871:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
2014-07-21 22:40:02 +02:00
n-aleha
d16ce21926 [ticket/12851] Fix the Font colour button title
PHPBB3-12851
2014-07-21 23:36:58 +03:00
Tristan Darricau
f27102b454 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12861] Add event to modify the post, poster and attachment data
2014-07-21 20:49:02 +02:00
Tristan Darricau
38100cc7c0 Merge pull request #2745 from nickvergessen/ticket/12861
[ticket/12861] Add event to modify the post, poster and attachment data

* nickvergessen/ticket/12861:
  [ticket/12861] Add event to modify the post, poster and attachment data
2014-07-21 20:48:30 +02:00
Dhruv
99cbfcb16d Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12656] Pass user object into all console commands.
2014-07-22 00:15:20 +05:30
Dhruv Goel
e11875527d Merge pull request #2752 from bantu/ticket/12656
[ticket/12656] Pass user object into all console commands for translation
2014-07-22 00:14:01 +05:30