]>
git.mxchange.org Git - friendica.git/log
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
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
Michael Vogel [Sun, 12 Jun 2016 21:06:48 +0000 (23:06 +0200)]
Some cleanup
Michael Vogel [Sun, 12 Jun 2016 19:59:46 +0000 (21:59 +0200)]
Merge pull request #2601 from rabuzarus/1206-short-info-fix
frio: bind short-info scrollspy on class fn (insteadof p-addr)
Michael Vogel [Sun, 12 Jun 2016 19:59:07 +0000 (21:59 +0200)]
Merge pull request #2600 from rabuzarus/1106-frio-settings
frio: some template clean up
Michael Vogel [Sun, 12 Jun 2016 19:07:45 +0000 (21:07 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup
Michael Vogel [Sun, 12 Jun 2016 19:04:55 +0000 (21:04 +0200)]
The queries for items are unified (a little bit)
rabuzarus [Sun, 12 Jun 2016 18:34:41 +0000 (20:34 +0200)]
frio: scrollspy info - forgot to change all classes
rabuzarus [Sun, 12 Jun 2016 18:25:30 +0000 (20:25 +0200)]
frio: bind short-info scrollspy on class fn (insteadof p-addr)
rabuzarus [Sun, 12 Jun 2016 18:20:17 +0000 (20:20 +0200)]
frio: little css fix
rabuzarus [Sun, 12 Jun 2016 18:09:02 +0000 (20:09 +0200)]
frio: some template clean up
Michael Vogel [Sun, 12 Jun 2016 18:08:48 +0000 (20:08 +0200)]
Merge pull request #2599 from rabuzarus/1106-frio-settings
frio: add templates for user settings
Michael Vogel [Sun, 12 Jun 2016 18:08:06 +0000 (20:08 +0200)]
Merge pull request #2598 from rabuzarus/1206-config-fix
fix config & pconfig
rabuzarus [Sun, 12 Jun 2016 17:59:27 +0000 (19:59 +0200)]
frio: add css for settings templates
rabuzarus [Sun, 12 Jun 2016 17:34:06 +0000 (19:34 +0200)]
Merge develop into 1106-frio-settings
rabuzarus [Sun, 12 Jun 2016 17:15:12 +0000 (19:15 +0200)]
fix federation statistics
rabuzarus [Sun, 12 Jun 2016 16:55:20 +0000 (18:55 +0200)]
fix config & pconfig
rabuzarus [Sun, 12 Jun 2016 16:23:10 +0000 (18:23 +0200)]
frio: first part for event template work
Michael Vogel [Sun, 12 Jun 2016 12:20:42 +0000 (14:20 +0200)]
Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
Michael Vogel [Sun, 12 Jun 2016 10:16:24 +0000 (12:16 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority
Michael Vogel [Sun, 12 Jun 2016 10:12:43 +0000 (12:12 +0200)]
Merge pull request #2587 from rabuzarus/1006-short-info
frio: a short contact informations will be provided at the second nav…
Michael Vogel [Sun, 12 Jun 2016 10:08:54 +0000 (12:08 +0200)]
Merge pull request #2594 from rabuzarus/1210-login-tpl
frio: provide login.tpl
Michael Vogel [Sun, 12 Jun 2016 10:06:15 +0000 (12:06 +0200)]
Just some added todo
rabuzarus [Sun, 12 Jun 2016 09:51:43 +0000 (11:51 +0200)]
frio: provide login.tpl
rabuzarus [Sun, 12 Jun 2016 08:50:56 +0000 (10:50 +0200)]
Merge pull request #2583 from fabrixxm/frio-login-modal
Frio: login button opens a modal
Michael Vogel [Sun, 12 Jun 2016 08:46:15 +0000 (10:46 +0200)]
Priority for native networks when searching by contact url
rabuzarus [Sat, 11 Jun 2016 22:15:48 +0000 (00:15 +0200)]
frio: add some more settings templates
rabuzarus [Sat, 11 Jun 2016 20:35:08 +0000 (22:35 +0200)]
frio: add settings.tpl
rabuzarus [Sat, 11 Jun 2016 16:51:20 +0000 (18:51 +0200)]
frio: closed profile setting sections on page load
rabuzarus [Sat, 11 Jun 2016 15:43:02 +0000 (17:43 +0200)]
frio short contact informations - some optical polishing
Michael Vogel [Sat, 11 Jun 2016 09:53:20 +0000 (11:53 +0200)]
Merge pull request #2590 from rabuzarus/1106_finding_string
unify heading of search results to "results for:"
rabuzarus [Sat, 11 Jun 2016 08:57:45 +0000 (10:57 +0200)]
reset gitignore
rabuzarus [Sat, 11 Jun 2016 08:52:26 +0000 (10:52 +0200)]
Merge develop into 1006-short-info
Conflicts:
view/theme/frio/js/theme.js
rabuzarus [Sat, 11 Jun 2016 08:44:52 +0000 (10:44 +0200)]
unify heading of search results to "results for:"
Michael Vogel [Sat, 11 Jun 2016 08:27:53 +0000 (10:27 +0200)]
Merge pull request #2588 from fabrixxm/nginx-sample-docs
Move Nginx reverse proxy sample from INSTALL to separate file
Michael Vogel [Sat, 11 Jun 2016 08:26:20 +0000 (10:26 +0200)]
Merge pull request #2586 from rabuzarus/1006-search
frio: improvements in search behavior
Michael Vogel [Sat, 11 Jun 2016 08:21:43 +0000 (10:21 +0200)]
Merge pull request #2589 from rabuzarus/1106-admin-clean
mod/admin.php: some clean up
rabuzarus [Sat, 11 Jun 2016 08:12:03 +0000 (10:12 +0200)]
mod/admin.php: some clean up
fabrixxm [Sat, 11 Jun 2016 07:58:26 +0000 (09:58 +0200)]
use js/modal.js to show Login page in modal
fabrixxm [Sat, 11 Jun 2016 07:40:50 +0000 (09:40 +0200)]
Frio: make jslint more happy
fabrixxm [Sat, 11 Jun 2016 07:27:00 +0000 (09:27 +0200)]
Move Nginx reverse proxy sample from INSTALL to separate file
projects / friendica.git / log