1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00

11962 Commits

Author SHA1 Message Date
Dhruv
6611329d83 [ticket/11271] Remove unnecessary inclusion of functions_display
PHPBB3-11271
2013-12-27 00:22:28 +05:30
Dhruv
3bae72d164 [ticket/11271] Typecast forum and topic id to integer
PHPBB3-11271
2013-12-27 00:22:27 +05:30
Dhruv
dc37f3a0e3 [ticket/11271] Use absolute path for displaying inline attachments in feeds
PHPBB3-11271
2013-12-27 00:22:26 +05:30
erangamapa
62263c13d4 [ticket/11271] Changed executable bit.
Changed executable bit value from 755 to 644.

PHPBB3-11271
2013-12-27 00:22:25 +05:30
erangamapa
08d69de933 [ticket/11271] Formatting code and removing null assignment.
Formatted code and replaced null assignment with empty array
assignment to attachments parameter in method 'feed_generate_content'.

PHPBB3-11271
2013-12-27 00:22:24 +05:30
erangamapa
cca4067694 [ticket/11271] Removing unnecessary database object
Removed unnecessary global database object from 'feed_generate_content'
Method.

PHPBB3-11271
2013-12-27 00:22:22 +05:30
erangamapa
8586171187 [ticket/11271] Separated attachment fetching query
Removed external query used to fetch related attachments.
Added attachments fetching method with database query to
post based feed.

PHPBB3-11271
2013-12-27 00:22:21 +05:30
erangamapa
91a14a9e63 [ticket/11271] Fetched feed attachments before loop.
Fetched feed attachments before looping through feed items and
send them to method 'feed_generate_content' for each feed item.

PHPBB3-11271
2013-12-27 00:22:20 +05:30
erangamapa
a41e2ca380 [ticket/11271] Removed in-line attachment comments properly.
Added a new regex to remove in-line attachment comments.

PHPBB3-11271
2013-12-27 00:22:19 +05:30
erangamapa
5bf4726195 [ticket/11271] Displaying in-line attached images in ATOM feed.
In-line attached images are not displaying as they are not parsing.
Included 'parse_attachments' column name for data fetching queries
in feed.php. Checked weather feeds have in-line attachments and
parsed them by using parse_attachments() method.

PHPBB3-11271
2013-12-27 00:22:18 +05:30
Joas Schilling
89fd73c18d Merge remote-tracking branch 'Elsensee/ticket/10023' into develop-olympus
* Elsensee/ticket/10023:
  [ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:21 +01:00
Oliver Schramm
e6b91de17b [ticket/10023] Make password change notification more noticeable
PHPBB3-10023
2013-12-12 16:57:06 +01:00
Joas Schilling
6658cd279c Merge remote-tracking branch 'Elsensee/ticket/12061' into develop-olympus
* Elsensee/ticket/12061:
  [ticket/12061] Fix keyboard shortcut in firefox
2013-12-09 01:21:24 +01:00
Oliver Schramm
204d6781d8 [ticket/12061] Fix keyboard shortcut in firefox
PHPBB3-12061
2013-12-06 19:59:33 +01:00
Joas Schilling
0e93c2516c Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympus
* bantu/ticket/12056:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
2013-12-04 15:56:03 +01:00
Andreas Fischer
e41cd384f5 [ticket/12056] Fix failure due to "Creating default object from empty value".
PHPBB3-12056
2013-12-04 13:22:47 +01:00
Joas Schilling
1977a10efb Merge remote-tracking branch 'bantu/ticket/11699' into develop-olympus
* bantu/ticket/11699:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
2013-12-02 23:32:39 +01:00
Joas Schilling
be338864ef Merge remote-tracking branch 'prototech/ticket/12048' into develop-olympus
* prototech/ticket/12048:
  [ticket/12048] Fix the regexp for language keys in custom bbcodes.
2013-12-02 10:07:06 +01:00
Cesar G
eef1b586d5 [ticket/12048] Fix the regexp for language keys in custom bbcodes.
PHPBB3-12048
2013-12-02 00:53:42 -08:00
Andreas Fischer
981df153d2 [ticket/11699] Also exclude the phpBB/cache directory.
PHPBB3-11699
2013-11-29 14:02:50 +01:00
Andreas Fischer
0834a749e7 [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
PHPBB3-11699
2013-11-29 14:00:55 +01:00
Andreas Fischer
97b1d70a37 [ticket/11699] Exclude build/new_version and build/old_versions from lint.
PHPBB3-11699
2013-11-29 10:50:38 +01:00
Joas Schilling
afb4585dd9 Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus
* prototech/ticket/12037:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.
2013-11-26 11:31:43 +01:00
Cesar G
e111d7bd13 [ticket/12037] Fix hard-coded text in acp_inactive.html.
PHPBB3-12037
2013-11-25 12:38:53 -08:00
Joas Schilling
af3417ce86 Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympus
* prototech/ticket/11814:
  [ticket/11814] Remove redundant text from the topic reply email notification.
2013-11-19 15:28:06 +01:00
Cesar G
f833a42e7e [ticket/11814] Remove redundant text from the topic reply email notification.
PHPBB3-11814
2013-11-19 06:20:37 -08:00
Nils Adermann
3eb4575f61 Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympus
* github-bantu/ticket/11970:
  [ticket/11970] Make apt-get less quiet.
  [ticket/11970] Add set -x to Travis setup scripts.
2013-10-26 10:53:35 -05:00
Andreas Fischer
e65483ac32 [ticket/11970] Make apt-get less quiet.
PHPBB3-11970
2013-10-26 01:39:04 +02:00
Andreas Fischer
3c135ccab2 [ticket/11970] Add set -x to Travis setup scripts.
Output is hidden by Travis by default and this will allow easier debugging.

PHPBB3-11970
2013-10-26 01:37:03 +02:00
Andreas Fischer
66841a55d0 Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympus
* bantu/ticket/11920:
  [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
2013-10-25 14:01:33 +02:00
Andreas Fischer
acc6e440d0 [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
PHPBB3-11920
2013-10-25 13:21:10 +02:00
Nils Adermann
5e01ea61f9 Merge branch 'task/github-readme/travis' into develop-olympus
* task/github-readme/travis:
  [task/github-readme/travis] Fix Travis-Badge and link
2013-10-24 21:53:47 -05:00
Falk Seidel
98a6f10ce7 [task/github-readme/travis] Fix Travis-Badge and link
PHPBB3-11968
2013-10-24 21:51:49 -05:00
Nils Adermann
a5eaaa10dc Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympus
* github-bantu/ticket/11951:
  [ticket/11951] Add MariaDB to platforms we test on.
  [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
2013-10-20 16:03:23 -07:00
Andreas Fischer
7df35a288a [ticket/11951] Add MariaDB to platforms we test on.
PHPBB3-11951
2013-10-19 23:08:04 +02:00
Andreas Fischer
6de519431d [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
PHPBB3-11951
2013-10-19 23:05:27 +02:00
Nils Adermann
16ab35c1b5 Merge pull request #1782 from bantu/ticket/11920
[ticket/11920] Actually call travis/setup-mariadb.sh.
2013-10-15 16:34:32 -07:00
Andreas Fischer
5a481bb176 [ticket/11920] Print MariaDB version after successful setup.
PHPBB3-11920
2013-10-16 00:25:07 +02:00
Andreas Fischer
0f64f0edc4 [ticket/11920] Manually purge mysql-common.
PHPBB3-11920
2013-10-16 00:24:44 +02:00
Andreas Fischer
878cb836f5 [ticket/11920] Actually call travis/setup-mariadb.sh.
PHPBB3-11920
2013-10-15 22:44:49 +02:00
Nils Adermann
8131700330 Merge pull request #1780 from bantu/ticket/11920
[ticket/11920] Add MariaDB environment to Travis-CI.
2013-10-15 13:34:51 -07:00
Andreas Fischer
55e24eb4f8 [ticket/11920] Have to use empty root password otherwise db creation fails.
PHPBB3-11920
2013-10-15 16:57:16 +02:00
Andreas Fischer
cdaea7a406 [ticket/11920] Add MariaDB environment to Travis-CI.
PHPBB3-11920
2013-10-15 16:28:59 +02:00
Nathan Guse
9e51b43829 Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympus
* remotes/bantu/ticket/11877:
  [ticket/11877] Create package links and checksums for announcement via script.
2013-10-03 22:26:14 -05:00
Andreas Fischer
8f2cebc0bb Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympus
* cyberalien/ticket/11879:
  [ticket/11879] Replace .live() with .on()
2013-10-02 15:00:26 +02:00
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on()
PHPBB3-11879
2013-10-02 11:12:41 +03:00
Andreas Fischer
dbd0380c3f [ticket/11877] Create package links and checksums for announcement via script.
PHPBB3-11877
2013-10-01 16:16:19 +02:00
Andreas Fischer
0cf9d657b7 [ticket/11876] Replace MD5 with SHA256.
PHPBB3-11876
2013-09-30 18:09:27 +02:00
Andreas Fischer
da9756ba25 [ticket/11876] Move checksum generation from build PHP files to phing build.xml
This also removes paths from the checksum files.

PHPBB3-11876
2013-09-30 18:08:42 +02:00
Andreas Fischer
ac4736db08 [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. 2013-09-30 17:04:14 +02:00