]>
git.mxchange.org Git - friendica.git/log
rabuzarus [Tue, 28 Jun 2016 10:32:09 +0000 (12:32 +0200)]
viewcontacts - fix: tabmenu was not returned
Tobias Diekershoff [Mon, 27 Jun 2016 13:12:45 +0000 (15:12 +0200)]
Merge pull request #2644 from rabuzarus/2706_hovercard_tags
hovercard.php - fix tags for hovercard
rabuzarus [Mon, 27 Jun 2016 09:57:47 +0000 (11:57 +0200)]
hovercard.php - fix tags for hovercard
Michael Vogel [Mon, 27 Jun 2016 09:34:02 +0000 (11:34 +0200)]
Merge pull request #2643 from rabuzarus/2606_jot_mobile
frio: restructure jot modal and make jot modal work on mobile
rabuzarus [Mon, 27 Jun 2016 08:33:20 +0000 (10:33 +0200)]
frio: restructure jot modal and make jot modal work on mobile
Tobias Diekershoff [Sun, 26 Jun 2016 14:25:30 +0000 (16:25 +0200)]
Merge pull request #2642 from rabuzarus/2606_frio_network_heading
frio: move some more headings to the navbar
rabuzarus [Sun, 26 Jun 2016 09:02:12 +0000 (11:02 +0200)]
frio: move some more headings to the navbar
Tobias Diekershoff [Sun, 26 Jun 2016 04:45:10 +0000 (06:45 +0200)]
Merge pull request #2641 from rabuzarus/2606_frio_jot
frio: fix - jot default was not removed in every case while inserting…
rabuzarus [Sun, 26 Jun 2016 01:49:21 +0000 (03:49 +0200)]
frio: fix - jot default was not removed in every case while inserting content
Tobias Diekershoff [Sat, 25 Jun 2016 17:51:00 +0000 (19:51 +0200)]
Merge pull request #2638 from annando/1606-avatar-handling
Imrpoved avatar handling when storing them/partly use of "micro"
Tobias Diekershoff [Sat, 25 Jun 2016 17:48:35 +0000 (19:48 +0200)]
Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs
viewcontacts - make the tabbar available even if hide-friends is active
Tobias Diekershoff [Sat, 25 Jun 2016 17:47:23 +0000 (19:47 +0200)]
Merge pull request #2640 from rabuzarus/2506_micropro
move html from function micropro() to own templates
rabuzarus [Sat, 25 Jun 2016 16:46:47 +0000 (18:46 +0200)]
move html from function micropro() to own templates
rabuzarus [Sat, 25 Jun 2016 14:20:44 +0000 (16:20 +0200)]
viewcontacts - make the tabbar available even if hide-friends is active
Michael Vogel [Sat, 25 Jun 2016 12:09:44 +0000 (14:09 +0200)]
Merge pull request #2637 from rabuzarus/2506_wallmessage_js
frio: Wallmessage - distinguish between own and foreign host
Michael Vogel [Sat, 25 Jun 2016 12:03:34 +0000 (14:03 +0200)]
Merge pull request #2636 from rabuzarus/2506_frio_strings
add missing strings for frio
rabuzarus [Sat, 25 Jun 2016 11:58:45 +0000 (13:58 +0200)]
Merge pull request #2635 from annando/1606-probe-diaspora
Support for the case when the guid and public key will vanish from webfinger
Michael Vogel [Sat, 25 Jun 2016 11:56:55 +0000 (13:56 +0200)]
Imrpoved avatar handling when storing them/partly use of "micro"
rabuzarus [Sat, 25 Jun 2016 11:02:53 +0000 (13:02 +0200)]
frio: Wallmessage - distinguish between own and foreign host
rabuzarus [Sat, 25 Jun 2016 10:21:13 +0000 (12:21 +0200)]
add missing strings for frio
Michael Vogel [Sat, 25 Jun 2016 09:52:52 +0000 (11:52 +0200)]
Store the guid value as well.
Michael Vogel [Fri, 24 Jun 2016 22:38:47 +0000 (00:38 +0200)]
Support for the case when the guid and public key will vanish from webfinger
Tobias Diekershoff [Fri, 24 Jun 2016 05:03:46 +0000 (07:03 +0200)]
Merge pull request #2633 from annando/1606-author-id-update
author-id/owner-id: Post update function/added database documentation
Tobias Diekershoff [Fri, 24 Jun 2016 04:59:35 +0000 (06:59 +0200)]
Merge pull request #2634 from rabuzarus/2306_Update_Network
network.php - raw && update mode don't need the network tabs
rabuzarus [Thu, 23 Jun 2016 22:33:31 +0000 (00:33 +0200)]
network.php - raw && update mode don't need the network tabs
Michael Vogel [Thu, 23 Jun 2016 21:24:27 +0000 (23:24 +0200)]
Merge pull request #2631 from rabuzarus/1906-event-test
cal export && public calendar - fix permissions
Michael Vogel [Thu, 23 Jun 2016 19:15:54 +0000 (21:15 +0200)]
author-id/owner-id: Post update function/added database documentation
rabuzarus [Thu, 23 Jun 2016 08:18:58 +0000 (10:18 +0200)]
Merge pull request #2632 from annando/1606-parse-title
Always parse the first title element
rabuzarus [Thu, 23 Jun 2016 08:07:13 +0000 (10:07 +0200)]
pub calendar - permission clean up and docu
Michael Vogel [Wed, 22 Jun 2016 19:00:58 +0000 (21:00 +0200)]
Always parse the first title element
rabuzarus [Wed, 22 Jun 2016 13:06:14 +0000 (15:06 +0200)]
pub calendar - add sql perms to the query (I forgot to do this)
rabuzarus [Wed, 22 Jun 2016 12:26:39 +0000 (14:26 +0200)]
Merge pull request #2624 from annando/1606-contact-id
Item: New fields for author id and owner id - avatar improvement with relocation
rabuzarus [Wed, 22 Jun 2016 11:50:47 +0000 (13:50 +0200)]
cal export && public calendar - even better permissions testing
rabuzarus [Tue, 21 Jun 2016 22:39:52 +0000 (00:39 +0200)]
cal export && public calendar - fix permissions
Michael Vogel [Tue, 21 Jun 2016 20:48:31 +0000 (22:48 +0200)]
Merge pull request #2628 from rabuzarus/1906-event-test
move the cal addon (exporting calendars) to core
fabrixxm [Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)]
Merge pull request #2630 from dissolve/mf2updates
update MF2 and vcard data for issue #2629
Ben Roberts [Tue, 21 Jun 2016 14:23:43 +0000 (10:23 -0400)]
update MF2 and vcard data for issue #2629
Michael Vogel [Tue, 21 Jun 2016 05:54:45 +0000 (07:54 +0200)]
Store the author-id and owner-id in mod/item.php as well
Michael Vogel [Mon, 20 Jun 2016 22:10:24 +0000 (00:10 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
rabuzarus [Mon, 20 Jun 2016 21:43:40 +0000 (23:43 +0200)]
Merge pull request #2627 from annando/1606-diaspora-uri
Diaspora: Try to fetch the uri if we already received the message
rabuzarus [Mon, 20 Jun 2016 21:38:34 +0000 (23:38 +0200)]
cal export - little fix for json
rabuzarus [Mon, 20 Jun 2016 21:31:49 +0000 (23:31 +0200)]
move the cal addon (exporting calendars) to core
Michael Vogel [Mon, 20 Jun 2016 20:48:55 +0000 (22:48 +0200)]
Diaspora: Try to fetch the uri if we already received the message
Michael Vogel [Mon, 20 Jun 2016 20:48:09 +0000 (22:48 +0200)]
Some manual revert ...
Michael Vogel [Mon, 20 Jun 2016 20:43:14 +0000 (22:43 +0200)]
Diaspora: Ensure that we always store the correct URI
Michael Vogel [Mon, 20 Jun 2016 20:03:40 +0000 (22:03 +0200)]
Search query optimized
Michael Vogel [Mon, 20 Jun 2016 12:26:27 +0000 (14:26 +0200)]
Merge pull request #2625 from rabuzarus/1906-event-test
frio: disable the events module link in the profile tab
rabuzarus [Mon, 20 Jun 2016 11:44:11 +0000 (13:44 +0200)]
frio: disable the events module link in the profile tab
Michael Vogel [Mon, 20 Jun 2016 05:28:47 +0000 (07:28 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
Michael Vogel [Mon, 20 Jun 2016 04:29:56 +0000 (06:29 +0200)]
Updated database.sql
Michael Vogel [Mon, 20 Jun 2016 04:23:25 +0000 (06:23 +0200)]
Merge pull request #2623 from rabuzarus/1906-event-test
implement a public calendar for vistors of someones profile page
Tobias Diekershoff [Sun, 19 Jun 2016 22:06:52 +0000 (00:06 +0200)]
Merge pull request #2620 from dissolve/2617
recreate fix for #2617 on correct branch
rabuzarus [Sun, 19 Jun 2016 20:04:34 +0000 (22:04 +0200)]
implement a public calendar for vistors of someones profile page
Michael Vogel [Sun, 19 Jun 2016 19:41:06 +0000 (21:41 +0200)]
Improved SQL queries
Michael Vogel [Sun, 19 Jun 2016 18:01:25 +0000 (20:01 +0200)]
Fix for author-thumb/owner-thumb - DFRN: Relocate stuff
Michael Vogel [Sun, 19 Jun 2016 06:32:38 +0000 (08:32 +0200)]
Optimised the amount of function for the item query
Michael Vogel [Sat, 18 Jun 2016 23:22:32 +0000 (01:22 +0200)]
Improved default value handling
Michael Vogel [Sat, 18 Jun 2016 23:07:20 +0000 (01:07 +0200)]
Massively updated avatar handling
Michael Vogel [Sat, 18 Jun 2016 19:32:07 +0000 (21:32 +0200)]
Merge pull request #2621 from rabuzarus/1206-events-template
frio - events - fix double click on date
rabuzarus [Sat, 18 Jun 2016 13:23:35 +0000 (15:23 +0200)]
frio - events - fix double click on date
Michael Vogel [Sat, 18 Jun 2016 13:01:00 +0000 (15:01 +0200)]
Merge pull request #2616 from rabuzarus/1206-events-template
use standard templates in events + frio templates for events
Michael Vogel [Sat, 18 Jun 2016 12:56:54 +0000 (14:56 +0200)]
Merge pull request #2615 from rabuzarus/1606-texthighlight
port of Hubzillas code highlight feature
Ben Roberts [Sat, 18 Jun 2016 12:16:09 +0000 (08:16 -0400)]
recreate fix for #2617 on correct branch
rabuzarus [Fri, 17 Jun 2016 13:29:01 +0000 (15:29 +0200)]
code highlight - some spacing for readability
rabuzarus [Fri, 17 Jun 2016 12:52:42 +0000 (14:52 +0200)]
frio - events - delete unneeded css
rabuzarus [Fri, 17 Jun 2016 12:39:59 +0000 (14:39 +0200)]
frio - events - restore lost css bracket after merging develop branch
rabuzarus [Fri, 17 Jun 2016 12:35:24 +0000 (14:35 +0200)]
Merge develop into 1206-events-template - restore gitignore
rabuzarus [Fri, 17 Jun 2016 12:33:08 +0000 (14:33 +0200)]
Merge develop into 1206-events-template
Conflicts:
view/theme/frio/css/style.css
rabuzarus [Fri, 17 Jun 2016 12:27:33 +0000 (14:27 +0200)]
frio - event - code clean up + docu
rabuzarus [Fri, 17 Jun 2016 12:09:18 +0000 (14:09 +0200)]
frio - event - some js and template refactoring + event view css styling
rabuzarus [Fri, 17 Jun 2016 09:18:54 +0000 (11:18 +0200)]
frio - event - correct some js
rabuzarus [Fri, 17 Jun 2016 09:02:27 +0000 (11:02 +0200)]
code highlight - add docu
rabuzarus [Fri, 17 Jun 2016 08:33:12 +0000 (10:33 +0200)]
frio: events - adapt changes to the templates of the other themes
rabuzarus [Thu, 16 Jun 2016 18:16:16 +0000 (20:16 +0200)]
frio: events - split event form in different sections
rabuzarus [Thu, 16 Jun 2016 09:38:12 +0000 (11:38 +0200)]
port of Hubzillas code highlight feature
Michael Vogel [Thu, 16 Jun 2016 08:48:52 +0000 (10:48 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
Michael Vogel [Thu, 16 Jun 2016 04:37:27 +0000 (06:37 +0200)]
Merge pull request #2613 from rabuzarus/1506-frio_bookmarklet
frio: open jot modal automatically on bookmarklet page
rabuzarus [Wed, 15 Jun 2016 22:27:45 +0000 (00:27 +0200)]
frio - bookmarklet - open jot only if it is available
rabuzarus [Wed, 15 Jun 2016 22:20:00 +0000 (00:20 +0200)]
frio: open jot modal automatically on bookmarklet page
Tobias Diekershoff [Wed, 15 Jun 2016 21:13:20 +0000 (23:13 +0200)]
Merge pull request #2612 from annando/1606-dfrn-relocate
dfrn relocate: addr field added, gcontact update added
Michael Vogel [Wed, 15 Jun 2016 19:23:22 +0000 (21:23 +0200)]
dfrn relocate: addr field added, gcontact update added
Michael Vogel [Wed, 15 Jun 2016 19:20:55 +0000 (21:20 +0200)]
New fields "author-id" and "owner-id" in the item table
Tobias Diekershoff [Tue, 14 Jun 2016 11:44:14 +0000 (13:44 +0200)]
Merge pull request #2610 from rabuzarus/1406-frio-search-fix
frio: fix searchbox - comment tag wasn't closed
rabuzarus [Tue, 14 Jun 2016 08:41:14 +0000 (10:41 +0200)]
frio: fix searchbox - comment tag wasn't closed
rabuzarus [Tue, 14 Jun 2016 08:05:07 +0000 (10:05 +0200)]
Merge pull request #2609 from annando/1606-categories
Categories were missing
Michael Vogel [Tue, 14 Jun 2016 07:50:17 +0000 (09:50 +0200)]
Categories were missing
rabuzarus [Mon, 13 Jun 2016 23:09:37 +0000 (01:09 +0200)]
Merge pull request #2607 from annando/1606-time-travel
Avoid time travel in posts (received before created)
Michael Vogel [Mon, 13 Jun 2016 20:32:40 +0000 (22:32 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-time-travel
rabuzarus [Mon, 13 Jun 2016 20:26:10 +0000 (22:26 +0200)]
Merge pull request #2606 from annando/1606-network-order
Bugfix: Items weren't sorted correctly
Michael Vogel [Mon, 13 Jun 2016 20:21:33 +0000 (22:21 +0200)]
Avoid time travel in posts (received before created)
Michael Vogel [Mon, 13 Jun 2016 20:20:09 +0000 (22:20 +0200)]
Bugfix: Items weren't sorted correctly
Michael Vogel [Mon, 13 Jun 2016 12:34:08 +0000 (14:34 +0200)]
Merge pull request #2605 from rabuzarus/1306-aside-group-fix
frio: fix an css issue with sidebar-group checkbox alignment
rabuzarus [Mon, 13 Jun 2016 10:17:33 +0000 (12:17 +0200)]
frio: fix an css issue with sidebar-group checkbox alignment
Michael Vogel [Mon, 13 Jun 2016 09:54:58 +0000 (11:54 +0200)]
Merge pull request #2604 from rabuzarus/1306-themesettings-fix
frio: settings_display.tpl + rise frio to 0.2 Alpha
rabuzarus [Mon, 13 Jun 2016 09:01:14 +0000 (11:01 +0200)]
Merge pull request #2603 from fabrixxm/0613-confix-fix-2
Fix Config and PConfig ::get() on new keys
rabuzarus [Mon, 13 Jun 2016 08:57:42 +0000 (10:57 +0200)]
frio: settings_display.tpl + rise frio to 0.2 Alpha
Fabrixxm [Mon, 13 Jun 2016 08:28:40 +0000 (10:28 +0200)]
Fix Config and PConfig ::get() on new keys
rabuzarus [Mon, 13 Jun 2016 08:19:38 +0000 (10:19 +0200)]
frio: events - work on event_form.tpl + datetime.php
rabuzarus [Mon, 13 Jun 2016 07:28:54 +0000 (09:28 +0200)]
Merge pull request #2595 from annando/1606-contact-priority
Priority for native networks when searching by contact url
rabuzarus [Mon, 13 Jun 2016 07:27:21 +0000 (09:27 +0200)]
Merge pull request #2602 from annando/1606-item-query-cleanup
Some item query cleanup
projects / friendica.git / log