mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00
Code Issues Releases Wiki Activity
23,665 Commits 18 Branches 192 Tags
cf71bfbdf25a70ab1fd1cf812bccc8400857cfd4
Commit Graph

1512 Commits

Author SHA1 Message Date
Marc Alexander
cf71bfbdf2 Merge branch 'develop-ascraeus' into develop 2014-09-16 19:24:45 +02:00
Marc Alexander
b3576d77da Merge pull request #2921 from Nicofuma/ticket/13034 
[ticket/13034] Fix the route generated for the frontend not in the phpbb root path
 2014-09-16 19:24:07 +02:00
Tristan Darricau
68ad7685bc [ticket/13034] Update the base url to move to the root dir 
PHPBB3-13034
 2014-09-15 23:47:05 +02:00
Tristan Darricau
06f42f433b [ticket/13034] Add comment 
PHPBB3-13034
 2014-09-15 20:25:20 +02:00
Tristan Darricau
b9e7ed004c [ticket/13034] Use utf8_basename 
PHPBB3-13034
 2014-09-14 23:41:15 +02:00
Andreas Fischer
93fbc468fb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12734] Remove unnecessary error supressing
 2014-09-12 00:54:51 +02:00
Jakub Senko
fcd2a2f186 [ticket/12734] Remove unnecessary error supressing 
PHPBB3-12734
 2014-09-10 18:37:16 +02:00
Joas Schilling
54ccea9312 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13048] Only update session_page if request is not ajax
 2014-09-07 12:50:55 +02:00
Jakub Senko
b218f3ad43 [ticket/13048] Only update session_page if request is not ajax 
PHPBB3-13048
 2014-09-07 10:15:51 +02:00
Tristan Darricau
af10ca630d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
 2014-09-06 15:47:47 +02:00
Tristan Darricau
297ab5c526 Merge pull request #2919 from Senky/ticket/12852 
[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
 2014-09-06 15:47:30 +02:00
Tristan Darricau
e0711b417f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
 2014-09-06 13:54:16 +02:00
Marc Alexander
21029e9fd2 [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests 
The mime type 'application/octet-stream' will still always be overwritten by
proper guesses. However, guesses with guessers that have a higher priority
will now overwrite previous guesses even if the mime types of these guesses
had a slash in them.

PHPBB3-13031
 2014-09-05 21:55:49 +02:00
Marc Alexander
d31ff51785 [ticket/13031] Guess with all mimetype guessers and pick best guess 
PHPBB3-13031
 2014-09-05 10:56:06 +02:00
Tristan Darricau
cb3eb84665 [ticket/13034] Fix the route generated for the frontend not in the phpbb root 
PHPBB3-13034
 2014-09-04 23:21:55 +02:00
Jakub Senko
1d4cae9ecb [ticket/12852] Add space after if 
PHPBB3-12852
 2014-09-04 17:44:41 +02:00
Jakub Senko
28587d0afc [ticket/12852] Remove whitespace 
PHPBB3-12852
 2014-09-04 16:15:45 +02:00
Jakub Senko
17e4e5f8c4 [ticket/12852] Make get_url_parts handle get variable with no value 
PHPBB3-12852
 2014-09-04 13:33:04 +02:00
Marc Alexander
cf5ae5abbc Merge branch 'develop-ascraeus' into develop 2014-09-02 20:55:25 +02:00
Marc Alexander
6777d462ff Merge pull request #2908 from Pico/t/12661 
[ticket/12661] Load extensions templates from "all" folder by render()
 2014-09-02 20:54:51 +02:00
Dhruv
df3bc78af8 Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12966] Sort by post_time and post_id where applicable
  [ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:41 +05:30
Dhruv Goel
6d9c0a76df Merge pull request #2865 from marc1706/ticket/12966 
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:01 +05:30
Marc Alexander
80a1314ebb Merge branch 'develop-ascraeus' into develop 2014-08-28 21:18:41 +02:00
n-aleha
bcc1b7aec9 [ticket/11909] Remove unused function load_migrations 
Remove unused function load_migrations from \phpbb\db\migrator

PHPBB3-11909
 2014-08-26 02:56:47 +03:00
Andreas Fischer
dde16e4b2a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
 2014-08-24 22:32:55 +02:00
Andreas Fischer
9fc5073540 Merge pull request #2905 from Nicofuma/ticket/13008 
[ticket/13008] Use an absolute path with the FileLocator for the routing files

* Nicofuma/ticket/13008:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
 2014-08-24 22:32:54 +02:00
Pico88
273fc5b5b6 [ticket/12661] Add template test 
PHPBB3-12661
 2014-08-24 10:16:39 +02:00
Pico88
ae3b015f65 [ticket/12661] Load extensions templates from "all" folder by render() 
PHPBB3-12661
 2014-08-24 08:10:37 +02:00
Marc Alexander
c2f19239a1 Merge branch 'develop-ascraeus' into develop 2014-08-24 00:20:51 +02:00
Tristan Darricau
1a41632af8 [ticket/12990] Disable all the notifications types which are not in the core 
PHPBB3-12990
 2014-08-23 23:39:46 +02:00
Marc Alexander
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable 
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
 2014-08-23 16:36:39 +02:00
Tristan Darricau
03b9eb5dcb [ticket/13008] Use an absolute path with the FileLocator for the routing files 
PHPBB3-13008
 2014-08-23 12:34:23 +02:00
Andreas Fischer
d2ed2c4e1e Merge pull request #2899 from Skouat/ticket/13003 
[ticket/13003] Add missing language keys

* Skouat/ticket/13003:
  [ticket/13003] Add missing language keys
 2014-08-22 11:59:26 +02:00
Andreas Fischer
5f4726e607 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13003] Add missing language keys
 2014-08-22 11:59:26 +02:00
Marc Alexander
2544d8f9d9 Merge branch 'develop-ascraeus' into develop 2014-08-21 20:50:05 +02:00
Mario Skouat
923a818e37 [ticket/13003] Add missing language keys 
PHPBB3-13003
 2014-08-21 19:37:03 +02:00
Tristan Darricau
afb9d0a3d7 [ticket/12990] Use {$var} instead of ${var} 
PHPBB3-12990
 2014-08-21 16:04:46 +02:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Tristan Darricau
71f78fb8c6 [ticket/12990] Use protected instead of private 
PHPBB3-12990
 2014-08-17 23:03:44 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types 
PHPBB3-12990
 2014-08-16 21:46:03 +02:00
Andreas Fischer
f3076cf444 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
 2014-08-16 09:50:51 +02:00
Tristan Darricau
e31aafb393 [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth 
PHPBB3-12975
 2014-08-12 23:12:57 +02:00
Joas Schilling
483b40dfa3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
 2014-08-12 10:17:47 +02:00
Joas Schilling
7367ab6e15 [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 2014-08-11 19:32:54 +02:00
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
 2014-08-11 17:38:29 +02:00
Nils Adermann
bad90dafbf Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus 
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
 2014-08-11 17:37:56 +02:00
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/config/services.yml
 2014-08-11 12:23:21 +02:00
Tristan Darricau
756aa68b34 [ticket/11854] Don't override get service name in nogd 
PHPBB3-11854
 2014-08-11 08:04:14 +02:00
Tristan Darricau
fa2ac1f271 [ticket/11854] Use a set_name method instead of overriding get_service_name 
PHPBB3-11854
 2014-08-11 01:16:58 +02:00
Tristan Darricau
76633544ee [ticket/11854] Change the error message in reCaptcha 
PHPBB3-11854
 2014-08-11 01:16:55 +02:00