Tristan Darricau
7548bc89ea
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12963] Always use core_path and core_directory()
[ticket/12963] Remove old migration/ folder from tests
[ticket/12963] Revert back to "migrations" folder name for extensions
2014-09-18 14:04:22 +02:00
Joas Schilling
c220fa89a1
[ticket/12963] Revert back to "migrations" folder name for extensions
...
The issues that can be created with the name change are just too much
PHPBB3-12963
2014-09-18 10:45:08 +02:00
Joas Schilling
45a4cf7ac5
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
2014-09-17 21:25:20 +02:00
Joas Schilling
7729ae4ad0
[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
...
This reverts commit 46a9fe93d7
.
PHPBB3-13064
2014-09-17 21:24:33 +02:00
Joas Schilling
dd89af7151
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:11:23 +02:00
Joas Schilling
910cd5edbe
Merge pull request #2948 from Nicofuma/ticket/13061
...
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
* Nicofuma/ticket/13061:
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:09:49 +02:00
Joas Schilling
bf6ecccd25
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:47 +02:00
Joas Schilling
86ea314598
Merge pull request #2951 from Nicofuma/ticket/13064
...
[ticket/13064] Validate the migrations provided to migrator::set_migrations()
* Nicofuma/ticket/13064:
[ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:39 +02:00
Marc Alexander
f6ccb30781
Merge branch 'develop-ascraeus' into develop
2014-09-17 00:57:34 +02:00
Marc Alexander
20903c0a9b
Merge pull request #2922 from Nicofuma/ticket/13036
...
[ticket/13036] Make the reference type configurable when generating a route
2014-09-17 00:57:04 +02:00
Marc Alexander
5fa2d19756
Merge branch 'develop-ascraeus' into develop
2014-09-17 00:37:07 +02:00
Marc Alexander
4a06511d85
Merge pull request #2932 from Nicofuma/ticket/12963
...
[ticket/12963] Load extensions migrations from /migration
2014-09-17 00:36:38 +02:00
Tristan Darricau
8b16d31413
[ticket/12963] Edit deprecation message
...
PHPBB3-12963
2014-09-16 20:18:10 +02:00
Tristan Darricau
bb5d6a2551
[ticket/13036] Add unit tests
...
PHPBB3-13036
2014-09-16 19:44:58 +02:00
Tristan Darricau
dab6b99bcd
[ticket/13036] Make the reference type configurable when generating a route
...
PHPBB3-13036
2014-09-16 19:28:06 +02:00
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
Tristan Darricau
46a9fe93d7
[ticket/13064] Validate the migrations provided to migrator::set_migrations()
...
PHPBB3-13064
2014-09-14 00:56:41 +02:00
Tristan Darricau
c988b98ac6
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
...
PHPBB3-13061
2014-09-13 14:34:18 +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
Tristan Darricau
72ee4b3a7c
[ticket/12963] Load extensions migrations from /migration
...
PHPBB3-12963
2014-09-10 19:21:57 +02:00
Tristan Darricau
ff872a7970
[ticket/12963] Don't use static var in \extension\base\get_migration_file_list
...
The static var was global to all instance of \phpbb\base and so if two
different instances (for two different extensions) were created by the
same script they shared the same migrations list.
PHPBB3-12963
2014-09-10 19:21:55 +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