|
|
dc45bc3c84
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-01-11 22:51:53 +00:00 |
|
Hypolite Petovan
|
c4db9edbe1
|
Merge pull request #4211 from annando/develop
bookmark elements weren't always parsed correctly
|
2018-01-11 17:51:10 -05:00 |
|
|
|
c0eecfc55f
|
Unbalanced html fixed
|
2018-01-11 22:34:56 +00:00 |
|
|
|
e18e081b47
|
bookmark elements weren't always parsed correctly
|
2018-01-11 22:28:46 +00:00 |
|
Hypolite Petovan
|
5f229e6030
|
Merge pull request #4210 from annando/fix-notification
Bugfix: The name of the item owner was empty in notifications
|
2018-01-11 17:14:42 -05:00 |
|
|
|
6f1b1aee4b
|
Bugfix: The name of the item owner was empty in notifications
|
2018-01-11 22:07:41 +00:00 |
|
Hypolite Petovan
|
d74292b7e1
|
Merge pull request #4209 from annando/oembed-link
When no OEmbedding is wanted, the links are now created fine again
|
2018-01-11 16:39:25 -05:00 |
|
|
|
a7b2db5db9
|
When no OEmbedding is wanted, the links are now created fine again
|
2018-01-11 21:31:44 +00:00 |
|
Michael Vogel
|
91198cb53d
|
Merge pull request #4206 from MrPetovan/task/fix-scrutinizer-issues
Improve dba::selectFirst calls
|
2018-01-11 20:35:41 +01:00 |
|
Hypolite Petovan
|
c54a2c1e83
|
Merge pull request #4208 from annando/thr-parent
When commenting on comments, the comment now appears under the comment
|
2018-01-11 14:21:24 -05:00 |
|
|
|
220106c90a
|
When commenting on comments, the comment now appears again under the comment
|
2018-01-11 19:17:40 +00:00 |
|
Hypolite Petovan
|
5ccbc95cef
|
Guard dba::lastInsertId() with result conditions
|
2018-01-11 03:49:02 -05:00 |
|
Hypolite Petovan
|
ed2ac8dc03
|
Fix formatting in NotificationsManager and Model\Contact
|
2018-01-11 03:43:57 -05:00 |
|
Hypolite Petovan
|
5fc4927764
|
Improve dba::selectFirst calls
- Fix remaining $r[0] references
- Rename $r to meaningful names
|
2018-01-11 03:43:57 -05:00 |
|
Michael Vogel
|
465e1d6a5c
|
Merge pull request #4191 from MrPetovan/bug/4173-fix-oembed-iframe-url
Fix oembed iframe url for Facebook attachments
|
2018-01-11 08:11:01 +01:00 |
|
Michael Vogel
|
10b4171b36
|
Merge pull request #4205 from MrPetovan/bug/4200-fix-contact-selectfirst
Fix selectFirst usage in Model\Contact
|
2018-01-11 06:00:04 +01:00 |
|
Hypolite Petovan
|
3f078d81ce
|
Fix selectFirst usage in Model\Contact
|
2018-01-10 20:13:51 -05:00 |
|
Hypolite Petovan
|
ebbf6089b4
|
Add database doc about the new oembed.maxwidth field
|
2018-01-10 19:25:08 -05:00 |
|
Hypolite Petovan
|
2f2ded4e55
|
[frio] Set videowidth to 622px
|
2018-01-10 19:25:08 -05:00 |
|
Hypolite Petovan
|
5691564220
|
Trust OEmbed HTML when it's available
- Reworked bb_attachment() to trust OEmbed content when it's
successfully pulled
- Fix coding standard by renaming parameter and variables
|
2018-01-10 19:25:08 -05:00 |
|
Hypolite Petovan
|
da9523ed23
|
Add maxwidth column to oembed table
- Match Caching key for OEmbed queries
|
2018-01-10 19:25:08 -05:00 |
|
Hypolite Petovan
|
47e0900220
|
Merge pull request #4202 from rabuzarus/20180110_-_init_app_in_sessionAuth
Bugfix: getApp() in sessionAuth()
|
2018-01-10 19:14:44 -05:00 |
|
rabuzarus
|
1bce1b57eb
|
convert line endings
|
2018-01-11 01:06:00 +01:00 |
|
Hypolite Petovan
|
b8fc30e061
|
Merge pull request #4204 from annando/issue-4200
Issue 4200: Adding new contacts not possible
|
2018-01-10 17:59:15 -05:00 |
|
|
|
fa9b7a4dcc
|
Issue 4200: Adding new contacts not possible
|
2018-01-10 22:56:06 +00:00 |
|
Hypolite Petovan
|
0c6c922ee6
|
Merge pull request #4203 from annando/dbupdate-food
The automatic database update had worked endlessly
|
2018-01-10 17:54:14 -05:00 |
|
|
|
90a00662ff
|
The automatic database update had worked endlessly
|
2018-01-10 22:44:38 +00:00 |
|
rabuzarus
|
d123a6523d
|
I shouldn't try to code today
|
2018-01-10 23:18:04 +01:00 |
|
rabuzarus
|
b1ae8151c2
|
fix a silly mistake
|
2018-01-10 22:57:27 +01:00 |
|
rabuzarus
|
4d5581a9d1
|
use self::getApp()->contact
|
2018-01-10 22:39:42 +01:00 |
|
rabuzarus
|
186b6330b9
|
Bugfix: getApp() in sessionAuth()
|
2018-01-10 22:21:22 +01:00 |
|
Michael Vogel
|
d23c1c0da7
|
Merge pull request #4194 from MrPetovan/task/fix-scrutinizer-issues
Replace dba::select(limit => 1) by dba::selectFirst()
|
2018-01-10 22:16:02 +01:00 |
|
Hypolite Petovan
|
b007f586dd
|
Merge pull request #4201 from annando/commenting-on-tags
Commenting on postings from tags on the network page does work now
|
2018-01-10 16:13:53 -05:00 |
|
|
|
0ef83b2383
|
Commenting on postings from tags on the network page does work now
|
2018-01-10 21:08:23 +00:00 |
|
Michael Vogel
|
7be65769c5
|
Merge pull request #4197 from rabuzarus/20180110_-_rename_saved_search_button
the "save" button is now 'follow' when searching for tags
|
2018-01-10 20:31:44 +01:00 |
|
Hypolite Petovan
|
1fda0ae4ae
|
Replace select(limit => 1) by selectFirst() in Model\Term and include/enotify
- Add new array declaration syntax
- Add braces
|
2018-01-10 13:04:00 -05:00 |
|
Hypolite Petovan
|
483d1a1bcb
|
Rename selectOne to selectFirst in comment
|
2018-01-10 12:57:21 -05:00 |
|
Hypolite Petovan
|
ae66bcaff3
|
Rename selectOne to selectFirst
|
2018-01-10 12:57:21 -05:00 |
|
Hypolite Petovan
|
c7a7658316
|
Fix documentation in include/dba
|
2018-01-10 12:57:21 -05:00 |
|
Hypolite Petovan
|
da60893590
|
Replace dba::select(limit => 1) by dba::selectOne
- Convert array declarations to new style
|
2018-01-10 12:57:21 -05:00 |
|
Hypolite Petovan
|
a2d3cee006
|
Merge pull request #4198 from zeroadam/Files-#3878
Move include/files to src
|
2018-01-10 12:56:02 -05:00 |
|
Adam Magness
|
594461189b
|
Review updates
require_once, foreach braces, new line EOF, and remove unneeded function.
|
2018-01-10 12:51:51 -05:00 |
|
Adam Magness
|
7723309310
|
Remove requires
Remove left over require_once statements.
|
2018-01-10 12:11:11 -05:00 |
|
Adam Magness
|
483c4e3803
|
selectFirst
dba::selectFirst hasn't been merged yet!
|
2018-01-10 12:08:56 -05:00 |
|
Adam Magness
|
dc175b8e12
|
Update functions and calls
Change function names, calls and use dba functions.
|
2018-01-10 12:05:20 -05:00 |
|
Adam Magness
|
55ee9a1c72
|
Move files to src
Move files.php and create Term class
|
2018-01-10 11:46:05 -05:00 |
|
rabuzarus
|
a75ececab4
|
remove @brief from the doc header
|
2018-01-10 16:39:59 +01:00 |
|
rabuzarus
|
eb031e7ee2
|
rename the "save" button to 'follow' when searching for tags
|
2018-01-10 16:08:39 +01:00 |
|
Hypolite Petovan
|
3f3e1c78dd
|
Merge pull request #4193 from annando/item-unification
We now are using a single function to store items
|
2018-01-10 09:11:36 -05:00 |
|
Michael Vogel
|
05674206ba
|
Merge pull request #4195 from zeroadam/ContactSelector-#3878
Move contact_selectors to src
|
2018-01-10 13:59:50 +01:00 |
|
