Commit graph

16715 commits

Author SHA1 Message Date
f949747e01
Merge pull request #3829 from annando/webfinger-clean
Some Webfinger clean up
2017-10-29 06:40:43 +01:00
e2224a2ddc Some Webfinger clean up 2017-10-28 11:48:29 +00:00
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
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
10ede73141 update for ES thx Albert 2017-10-26 09:49:08 +02:00
b8a8bb21d0 Merge pull request #3825 from annando/index-length
Bugfix for "Index column size too large"
2017-10-25 07:16:45 +02:00
6d1ba768ef Reverted some test 2017-10-25 04:47:04 +00:00
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
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
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
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
b513a597c8 Static methods should be called statically 2017-10-21 16:13:25 +00:00
2624abdc35 Now only resize if supported 2017-10-21 15:31:31 +00:00
09727024ba Better handling for GIF even, if not supported by the graphics library 2017-10-21 15:09:47 +00:00
405b6cf4ef DBStructure: Better handling of temp table 2017-10-21 14:29:55 +00:00
Michael Vogel
2a5dd1e857 Merge pull request #3815 from rabuzarus/20171019_-_fix_more_posted_date_widget
fix some more HTML violations in posted_date_widget.tpl
2017-10-21 08:14:52 +02:00
rabuzarus
30a4857842 more template code simplification in posted_date_widget 2017-10-20 16:12:43 +02:00
rabuzarus
781c4986c6 a little bit template code simplification in posted_date_widget 2017-10-20 15:59:14 +02:00
rabuzarus
f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
rabuzarus
8167e75e6a fix some more HTML violations in posted_date_widget.tpl 2017-10-19 16:34:08 +02:00
Michael Vogel
6367439e8a Merge pull request #3814 from rabuzarus/20171019_-_fix_event_display_in_stream
fix #3812 - some brocken parts in the display of events (default template)
2017-10-19 14:54:33 +02:00
rabuzarus
184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
704aef67fb Merge pull request #3811 from annando/remove-service-class
Removed "service class" functionality
2017-10-19 12:44:45 +02:00
69afe50345 Removed stuff that was never used or isn't used anymore 2017-10-19 07:41:15 +00:00
Michael Vogel
b78996416c Merge pull request #3809 from rabuzarus/20171018_-_fix_posted_date_widget
Bugfix: useless li end tag in posted_date_widget.tpl
2017-10-19 07:50:45 +02:00
rabuzarus
8cc17bdde6 fix coding style 2017-10-19 00:52:01 +02:00
Michael Vogel
e7f64dde55 Merge pull request #3810 from rabuzarus/20171018_-_fix_duplcate_id
Bugfix: fix some duplicate ID in frio
2017-10-18 23:47:40 +02:00
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
rabuzarus
dd8ff1f097 remove unused 'aria-labelledby' in frios modal 2017-10-18 23:38:51 +02:00
rabuzarus
a6e8734a37 Bugfix: fix some duplicate ID 2017-10-18 23:22:05 +02:00
rabuzarus
6630e50ecf Bugfix:useless li end tag in posted_date_widget.tpl 2017-10-18 22:49:16 +02:00
rabuzarus
1b53b8cae9 Merge pull request #3808 from annando/nets-cid
Bugfix: Switch to all networks when posts for a single contact are selected
2017-10-18 21:30:39 +02:00
Michael Vogel
a6d6d2c482 Merge pull request #3807 from rabuzarus/20171018_-_frio_fix_some_event_stream_stuff
fix some small css in frio for displaying events in the stream
2017-10-18 20:59:46 +02:00
c92ed9bc5e Bugfix: Switch to all networks when posts for a single contact are selected. 2017-10-18 18:54:06 +00:00
rabuzarus
7ddc5339fd frio: fix event seperator 2017-10-18 20:44:29 +02:00
48e471855e Merge pull request #3806 from annando/expire
Bugfix: Item were stored before the expiration date
2017-10-18 20:23:01 +02:00