Hypolite Petovan
|
42283c87d3
|
Merge pull request #3854 from tobiasd/20171101-es
update for ES thx Albert
|
2017-11-01 12:04:18 -04:00 |
|
 Tobias Diekershoff
|
e3c3cf96b3
|
update for ES thx Albert
|
2017-11-01 17:00:08 +01:00 |
|
|
Tobias Diekershoff
|
db04a78d84
|
Merge pull request #3849 from annando/forum-exclamation
Use the exclamation mark to address forums as well
|
2017-10-31 22:22:46 +01:00 |
|
 Michael
|
c31d382e7d
|
Added documentation
|
2017-10-31 21:11:30 +00:00 |
|
|
Michael
|
ba6cb7bacf
|
Merge remote-tracking branch 'upstream/develop' into forum-exclamation
|
2017-10-31 20:02:36 +00:00 |
|
Michael Vogel
|
92a17643c9
|
Merge pull request #3848 from annando/session-destroy
Bugfix: Avoid dba error message
|
2017-10-31 21:00:31 +01:00 |
|
|
Michael
|
5222606602
|
Use the exclamation mark to address forums as well
|
2017-10-31 19:33:23 +00:00 |
|
|
Michael
|
ba627c740f
|
Bugfix: Avoid dba error message
|
2017-10-31 19:28:39 +00:00 |
|
|
Tobias Diekershoff
|
22aa7f9f07
|
Merge pull request #3846 from annando/session-destroy
Avoid warning "Failed to write session data"
|
2017-10-31 18:37:45 +01:00 |
|
|
Tobias Diekershoff
|
4d6ab63a5a
|
Merge pull request #3847 from annando/some-more-onepoll
Some more onepoll bautification
|
2017-10-31 18:37:15 +01:00 |
|
|
Michael
|
4b0f8dad49
|
Some more onepoll bautification
|
2017-10-31 16:18:48 +00:00 |
|
|
Michael
|
7566464a58
|
Avoid warning "Failed to write session data"
|
2017-10-31 16:03:01 +00:00 |
|
|
Tobias Diekershoff
|
3e0361fe07
|
Merge pull request #3845 from annando/onepoll-rework
onepoll.php is reworked
|
2017-10-31 15:12:42 +01:00 |
|
|
Michael
|
a492a13aeb
|
onepoll.php is reworked
|
2017-10-31 13:32:11 +00:00 |
|
|
Tobias Diekershoff
|
078690e91c
|
Merge pull request #3844 from annando/no-fragment
Bugfix: not complete a url with parameter or fragment
|
2017-10-31 08:08:18 +01:00 |
|
|
Michael
|
9804e65d18
|
Bugfix: not complete a url with parameter or fragment
|
2017-10-31 06:05:52 +00:00 |
|
|
Hypolite Petovan
|
6afd2313e0
|
Merge pull request #3842 from hoergen/patch-3
Update display.php
|
2017-10-30 21:49:50 -04:00 |
|
 hoergen
|
a5d8d1fd77
|
Update display.php
adding baseurl to image tags for twitter and open Graph
|
2017-10-31 02:45:58 +01:00 |
|
|
Hypolite Petovan
|
1c890aedb8
|
Merge pull request #3836 from tobiasd/20171030-es
update for ES thx Albert
|
2017-10-30 08:23:02 -04:00 |
|
|
Tobias Diekershoff
|
65e96caf29
|
update for ES thx Albert
|
2017-10-30 10:36:45 +01:00 |
|
|
Tobias Diekershoff
|
404ed27fb4
|
Merge pull request #3830 from annando/dba-pdo-connected
DBA: The "connected" check for PDO didn't work.
|
2017-10-29 08:11:27 +01:00 |
|
|
Tobias Diekershoff
|
bf29d81984
|
Merge pull request #3831 from annando/issue-3828
Issue 3828: Better handling if query doesn't return a value
|
2017-10-29 08:10:53 +01:00 |
|
|
Michael
|
83bbbd1fe3
|
Issue 3828: Better handling if query doesn't return a value
|
2017-10-29 06:49:43 +00:00 |
|
|
Michael
|
1cbe27de12
|
DBA: The "connected" check for PDO didn't work.
|
2017-10-29 06:31:01 +00:00 |
|
|
Tobias Diekershoff
|
f949747e01
|
Merge pull request #3829 from annando/webfinger-clean
Some Webfinger clean up
|
2017-10-29 06:40:43 +01:00 |
|
|
Michael
|
e2224a2ddc
|
Some Webfinger clean up
|
2017-10-28 11:48:29 +00:00 |
|
|
Tobias Diekershoff
|
992b721de6
|
Merge pull request #3827 from annando/hubzilla-webfinger
Hubzilla doesn't return the handle in the hcard
|
2017-10-27 09:47:47 +02:00 |
|
|
Michael
|
0b7e8b7fb4
|
Hubzilla doesn't return the handle in the hcard
|
2017-10-27 06:17:24 +00:00 |
|
|
Michael Vogel
|
90463919d6
|
Merge pull request #3826 from tobiasd/20171026-es
update for ES thx Albert
|
2017-10-26 12:02:11 +02:00 |
|
|
Tobias Diekershoff
|
10ede73141
|
update for ES thx Albert
|
2017-10-26 09:49:08 +02:00 |
|
|
Tobias Diekershoff
|
b8a8bb21d0
|
Merge pull request #3825 from annando/index-length
Bugfix for "Index column size too large"
|
2017-10-25 07:16:45 +02:00 |
|
|
Michael
|
6d1ba768ef
|
Reverted some test
|
2017-10-25 04:47:04 +00:00 |
|
|
Michael
|
6396f92d9b
|
Bugfix for "Index column size too large"
|
2017-10-25 04:44:45 +00:00 |
|
|
Hypolite Petovan
|
dbb5df7f7d
|
Merge pull request #3823 from fabrixxm/feature/api/friends_order
Order result of api/statues/friends by nickname
|
2017-10-24 15:33:02 -04:00 |
|
fabrixxm
|
a83b051003
|
Order result of api/statues/friends by nickname
|
2017-10-24 21:29:43 +02:00 |
|
|
Hypolite Petovan
|
0d65b3d5e2
|
Merge pull request #3821 from rabuzarus/20171022_-_frio_cache_css
frio: use cached css if no settings (or file) have changed + frio color settings for admins
|
2017-10-24 10:59:33 -04:00 |
|
rabuzarus
|
578dc6f967
|
frio: sanitize $schema only if the variable is initialized
|
2017-10-24 14:44:31 +02:00 |
|
|
rabuzarus
|
2687a42e3c
|
frio: sanitise $schema
|
2017-10-23 22:14:35 +02:00 |
|
|
rabuzarus
|
7e273ba51b
|
frio: fix wrong slider position in the theme_settings
|
2017-10-23 21:15:46 +02:00 |
|
|
rabuzarus
|
6a8969452a
|
frio: add the possibility for the admin to change the colors for non personal pages
|
2017-10-23 20:26:31 +02:00 |
|
|
Hypolite Petovan
|
0c347d1466
|
Merge pull request #3819 from annando/photo-rework
Better handling for GIF even, if not supported by the graphics library
|
2017-10-23 13:04:52 -04:00 |
|
|
Michael
|
e40c3a9d7c
|
Static public is public static
|
2017-10-23 14:49:56 +00:00 |
|
|
Hypolite Petovan
|
476d7d9533
|
Merge pull request #3813 from annando/remove-old-stuff
Removed stuff that was never used or isn't used anymore
|
2017-10-23 10:00:16 -04:00 |
|
|
rabuzarus
|
1585918f29
|
frio: set a dummy img for background image if no img was set (Otherwise the empty value would be replaced in the browser with a path to the theme and the css would be loaded a second time)
|
2017-10-23 15:25:09 +02:00 |
|
|
rabuzarus
|
9be6dfadba
|
frio: use cached css if no settings (or file) have changed
|
2017-10-23 15:16:23 +02:00 |
|
|
Tobias Diekershoff
|
d39b0584f0
|
Merge pull request #3818 from annando/structure-temp
DBStructure: Better handling of temp table
|
2017-10-23 11:47:46 +02:00 |
|
rabuzarus
|
2332d9f62a
|
Merge pull request #3820 from annando/contact-posts
The selection between posts from forums and other users had a problem
|
2017-10-22 14:09:18 +02:00 |
|
|
Michael
|
596bb36151
|
Bugfix: The selection between posts from forums and other users had a problem
|
2017-10-22 09:02:54 +00:00 |
|
|
Michael Vogel
|
2c55d9f3ce
|
Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations
fix some HTML violations in frio
|
2017-10-22 07:48:06 +02:00 |
|
|
Michael
|
b513a597c8
|
Static methods should be called statically
|
2017-10-21 16:13:25 +00:00 |
|