]>
git.mxchange.org Git - friendica.git/log
Michael Vogel [Mon, 6 Jun 2016 04:21:36 +0000 (06:21 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
Tobias Diekershoff [Mon, 6 Jun 2016 04:07:09 +0000 (06:07 +0200)]
Merge pull request #2563 from rabuzarus/0506-contact-transition
frio: give the contact actions a little transition effect
Tobias Diekershoff [Mon, 6 Jun 2016 04:06:21 +0000 (06:06 +0200)]
Merge pull request #2564 from annando/1606-contact-handling
Fix for mismatching avatars
Michael Vogel [Sun, 5 Jun 2016 20:21:34 +0000 (22:21 +0200)]
The local contact search now uses local data if present
Michael Vogel [Sun, 5 Jun 2016 19:22:14 +0000 (21:22 +0200)]
Baseurl removed
Michael Vogel [Sun, 5 Jun 2016 19:17:55 +0000 (21:17 +0200)]
Fetching of profile data improved
Michael Vogel [Sun, 5 Jun 2016 18:01:38 +0000 (20:01 +0200)]
Some more cleanup and code removal.
rabuzarus [Sun, 5 Jun 2016 15:12:13 +0000 (17:12 +0200)]
frio: remove legacy transition css
Michael Vogel [Sun, 5 Jun 2016 13:09:40 +0000 (15:09 +0200)]
Some better handling of "bd" and "birthday"
Michael Vogel [Sun, 5 Jun 2016 13:03:04 +0000 (15:03 +0200)]
"bd" now always shows the upcoming birthday
Michael Vogel [Sun, 5 Jun 2016 11:57:11 +0000 (13:57 +0200)]
Unified contact data handling
rabuzarus [Sun, 5 Jun 2016 07:56:53 +0000 (09:56 +0200)]
frio: give the contact actions a little transition effect
Tobias Diekershoff [Sat, 4 Jun 2016 17:40:46 +0000 (19:40 +0200)]
Merge pull request #2562 from friendica/fabrixxm-patch-1
Wild "+" in js/main.js
fabrixxm [Sat, 4 Jun 2016 16:44:20 +0000 (18:44 +0200)]
Wild "+" in js/main.js
Michael Vogel [Sat, 4 Jun 2016 10:30:24 +0000 (12:30 +0200)]
removed some copy&paste fragments
Michael Vogel [Sat, 4 Jun 2016 10:23:12 +0000 (12:23 +0200)]
Added documentation
Michael Vogel [Sat, 4 Jun 2016 10:20:09 +0000 (12:20 +0200)]
removed duplicated functions
Michael Vogel [Sat, 4 Jun 2016 09:04:26 +0000 (11:04 +0200)]
Configurable amount of maximum processes
Michael Vogel [Sat, 4 Jun 2016 08:18:43 +0000 (10:18 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
rabuzarus [Sat, 4 Jun 2016 07:45:42 +0000 (09:45 +0200)]
Merge pull request #2554 from annando/1606-mention-class
Mentions are now having an own class
Michael Vogel [Fri, 3 Jun 2016 21:10:23 +0000 (23:10 +0200)]
Quit when processlist is too long
Michael Vogel [Fri, 3 Jun 2016 17:02:22 +0000 (19:02 +0200)]
Merge pull request #2560 from rabuzarus/0306-bulk-delete
frio: fix bulk deletion doesn't appear if post item was inserted by js
rabuzarus [Fri, 3 Jun 2016 16:55:57 +0000 (18:55 +0200)]
frio: fix bulk deletion doesn't appear if post item was inserted by js
Michael Vogel [Fri, 3 Jun 2016 05:47:30 +0000 (07:47 +0200)]
Merge pull request #2559 from rabuzarus/0206-network-content-images-css
frio: give images in the networstream a little border-radius
rabuzarus [Thu, 2 Jun 2016 20:11:41 +0000 (22:11 +0200)]
frio: give images in the networstream a little border-radius
Michael Vogel [Thu, 2 Jun 2016 19:50:38 +0000 (21:50 +0200)]
Merge pull request #2558 from rabuzarus/0206-share-content
frio: remove js part for shared-content div because it's now done by …
rabuzarus [Thu, 2 Jun 2016 18:59:31 +0000 (20:59 +0200)]
frio: remove js part for shared-content div because it's now done by core
Michael Vogel [Thu, 2 Jun 2016 05:37:37 +0000 (07:37 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
Tobias Diekershoff [Thu, 2 Jun 2016 04:05:39 +0000 (06:05 +0200)]
Merge pull request #2557 from annando/1606-frio-share
Shared content now has a surrounding div
Michael Vogel [Wed, 1 Jun 2016 20:05:09 +0000 (22:05 +0200)]
Merge pull request #2555 from rabuzarus/0106-contact_actions
frio: adding contact actions on hover for contacts in contact view
Michael Vogel [Wed, 1 Jun 2016 19:58:50 +0000 (21:58 +0200)]
One div too much
Michael Vogel [Wed, 1 Jun 2016 19:57:08 +0000 (21:57 +0200)]
Shared content now has a surrounding div
Michael Vogel [Wed, 1 Jun 2016 19:54:02 +0000 (21:54 +0200)]
The poller now has the logging for processes as well.
Michael Vogel [Wed, 1 Jun 2016 19:21:48 +0000 (21:21 +0200)]
Merge pull request #2556 from tobiasd/shashapes
ShaShape font updated
Tobias Diekershoff [Wed, 1 Jun 2016 18:03:56 +0000 (20:03 +0200)]
ShaShape font updated
rabuzarus [Wed, 1 Jun 2016 15:21:57 +0000 (17:21 +0200)]
frio: adding contact actions on hover for contacts in contact view
Michael Vogel [Wed, 1 Jun 2016 15:10:43 +0000 (17:10 +0200)]
By setting the "userinfo" class the hovercard in frio works with mentions
Michael Vogel [Wed, 1 Jun 2016 14:19:53 +0000 (16:19 +0200)]
Tags are now supported as well
Michael Vogel [Wed, 1 Jun 2016 14:04:31 +0000 (16:04 +0200)]
Mentions are now having an own class
Michael Vogel [Wed, 1 Jun 2016 12:39:08 +0000 (14:39 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
Michael Vogel [Wed, 1 Jun 2016 12:38:42 +0000 (14:38 +0200)]
Merge pull request #2553 from rabuzarus/0106-frio-tooltip-fix
frio: provide a tooltip for nav search
rabuzarus [Wed, 1 Jun 2016 12:04:39 +0000 (14:04 +0200)]
frio: give the heading "messages" a class "heading" - This is needed for pm modal where class heading becomes the modal title)
rabuzarus [Wed, 1 Jun 2016 09:59:35 +0000 (11:59 +0200)]
frio: provide a tooltip for nav search
Michael Vogel [Wed, 1 Jun 2016 08:58:09 +0000 (10:58 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
Michael Vogel [Wed, 1 Jun 2016 08:57:59 +0000 (10:57 +0200)]
Merge pull request #2551 from rabuzarus/0106-frio-tooltip-fix
frio: show tooltip only on hover (and not on focus)
Michael Vogel [Wed, 1 Jun 2016 08:55:13 +0000 (10:55 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
rabuzarus [Wed, 1 Jun 2016 07:39:20 +0000 (09:39 +0200)]
frio: show tooltip only on hover (and not on focus)
rabuzarus [Wed, 1 Jun 2016 07:21:58 +0000 (09:21 +0200)]
Merge pull request #2550 from annando/1605-frio-github-markread
Frio: Removed github link, changed notification description
Tobias Diekershoff [Wed, 1 Jun 2016 05:28:50 +0000 (07:28 +0200)]
Merge pull request #2549 from annando/1605-ostatus-repeat
OStatus: repeated items in OStatus had a wrong "edited" date
Michael Vogel [Wed, 1 Jun 2016 05:05:44 +0000 (07:05 +0200)]
Added short description to "mark as seen"
Michael Vogel [Wed, 1 Jun 2016 05:04:31 +0000 (07:04 +0200)]
New class "dbm" for the database management
Michael Vogel [Wed, 1 Jun 2016 05:03:03 +0000 (07:03 +0200)]
Changed option description
Michael Vogel [Tue, 31 May 2016 20:27:36 +0000 (22:27 +0200)]
The user name moved to the central.
Michael Vogel [Tue, 31 May 2016 20:09:35 +0000 (22:09 +0200)]
Removed todo
Michael Vogel [Tue, 31 May 2016 20:07:29 +0000 (22:07 +0200)]
Frio: Removed github link, changed notification description
Michael Vogel [Tue, 31 May 2016 19:18:14 +0000 (21:18 +0200)]
OStatus: repeated items in OStatus had a wrong "edited" date
rabuzarus [Mon, 30 May 2016 19:47:40 +0000 (21:47 +0200)]
Merge pull request #2548 from annando/1605-network-widget
Frio: The network widget and the file widget now look better
Michael Vogel [Mon, 30 May 2016 19:43:49 +0000 (21:43 +0200)]
Indention of the html code
Michael Vogel [Mon, 30 May 2016 19:17:28 +0000 (21:17 +0200)]
The file widget looks now better as well
Michael Vogel [Mon, 30 May 2016 19:00:00 +0000 (21:00 +0200)]
Frio: The network widget now shows the selected network
Michael Vogel [Mon, 30 May 2016 13:06:16 +0000 (15:06 +0200)]
Merge pull request #2547 from rabuzarus/3005-frio_display_fix
frio: commented out some js for the color highlight in /display/ beca…
rabuzarus [Mon, 30 May 2016 13:01:30 +0000 (15:01 +0200)]
frio: commented out some js for the color highlight in /display/ because it causes some errors in ff
Tobias Diekershoff [Mon, 30 May 2016 12:35:04 +0000 (14:35 +0200)]
Merge pull request #2544 from annando/issue-1769
Issue 1769: Some enhancements for sending wall mails
rabuzarus [Mon, 30 May 2016 06:51:33 +0000 (08:51 +0200)]
Merge pull request #2546 from annando/1605-frio-template-clean
frio: Some small template clean up
Michael Vogel [Mon, 30 May 2016 05:24:06 +0000 (07:24 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean
Michael Vogel [Mon, 30 May 2016 05:18:25 +0000 (07:18 +0200)]
Adopted the changes to the other themes as well.
Tobias Diekershoff [Mon, 30 May 2016 04:25:29 +0000 (06:25 +0200)]
Merge pull request #2543 from annando/frio-hovercard
Frio: Hovercard is now a core function
Michael Vogel [Mon, 30 May 2016 03:21:57 +0000 (05:21 +0200)]
Adapting the changes to search_item.tpl as well
Michael Vogel [Sun, 29 May 2016 21:42:22 +0000 (23:42 +0200)]
frio: Some small template clean up
rabuzarus [Sun, 29 May 2016 21:15:29 +0000 (23:15 +0200)]
Merge pull request #2545 from annando/1605-frio-separator
Frio: The separator dots are enabled again
Michael Vogel [Sun, 29 May 2016 21:02:48 +0000 (23:02 +0200)]
Frio: The separator dots are enabled again
Michael Vogel [Sun, 29 May 2016 20:13:08 +0000 (22:13 +0200)]
Now with correct url
Michael Vogel [Sun, 29 May 2016 20:02:31 +0000 (22:02 +0200)]
Better detection for remote user
Michael Vogel [Sun, 29 May 2016 19:29:26 +0000 (21:29 +0200)]
Wall message can now redirect to your own page if you are connected.
Michael Vogel [Sun, 29 May 2016 17:35:23 +0000 (19:35 +0200)]
Issue 1769: Some enhancements for sending wall mails
rabuzarus [Sun, 29 May 2016 13:59:28 +0000 (15:59 +0200)]
Merge pull request #2542 from annando/1605-more-frio2
Frio: Bugfix for linebreaks in location
Michael Vogel [Sun, 29 May 2016 13:40:24 +0000 (15:40 +0200)]
And some more
Michael Vogel [Sun, 29 May 2016 13:33:36 +0000 (15:33 +0200)]
Some location changes
Michael Vogel [Sun, 29 May 2016 13:28:31 +0000 (15:28 +0200)]
Frio: Hovercard is now a core function
Tobias Diekershoff [Sun, 29 May 2016 10:20:39 +0000 (12:20 +0200)]
Merge pull request #2541 from annando/1605-photo-upload
Sometimes uploaded pictures weren't posted correctly to other networks
Michael Vogel [Sun, 29 May 2016 08:59:06 +0000 (10:59 +0200)]
Bugfix: Sometimes uploaded pictures weren't posted correctly to other networks
Michael Vogel [Sun, 29 May 2016 08:56:49 +0000 (10:56 +0200)]
frio: Bugfix for linebreak of locations in comments
Michael Vogel [Sat, 28 May 2016 11:49:05 +0000 (13:49 +0200)]
Merge pull request #2538 from rabuzarus/2805_frio_mobile
frio: open hovercard on click if device is a mobile device
Michael Vogel [Sat, 28 May 2016 11:47:41 +0000 (13:47 +0200)]
Frio: Location should look now similar everywhere
rabuzarus [Sat, 28 May 2016 11:38:55 +0000 (13:38 +0200)]
Merge pull request #2536 from annando/1605-more-frio
Frio: Like, Dislike and comment are having icons, links are underlined
Michael Vogel [Sat, 28 May 2016 11:08:43 +0000 (13:08 +0200)]
Frio: Adopt changes to search_item.tpl as well.
rabuzarus [Sat, 28 May 2016 11:07:24 +0000 (13:07 +0200)]
frio: open hovercard on click if device is a mobile device
Michael Vogel [Sat, 28 May 2016 08:08:25 +0000 (10:08 +0200)]
Merge pull request #2534 from fabrixxm/frio-smallfixes
Small fixes to Frio theme
Michael Vogel [Sat, 28 May 2016 07:57:19 +0000 (09:57 +0200)]
Frio: Like, Dislike and comment are having icons, links are underlined
rabuzarus [Fri, 27 May 2016 19:07:40 +0000 (21:07 +0200)]
Merge pull request #2535 from annando/1605-frio-notif-cursor
Frio: When hovering over the notification entries the cursor is now a pointer
Michael Vogel [Fri, 27 May 2016 18:33:29 +0000 (20:33 +0200)]
Frio: When hovering over the notification entries the cursor is now a pointer
fabrixxm [Fri, 27 May 2016 13:53:11 +0000 (15:53 +0200)]
Frio: remove header(location) in default.php
The call to header() is too late in code (output was already sent)
fabrixxm [Fri, 27 May 2016 13:50:51 +0000 (15:50 +0200)]
Frio: Fix warnings in config page
Tobias Diekershoff [Fri, 27 May 2016 05:22:53 +0000 (07:22 +0200)]
Merge pull request #2532 from annando/1605-attachment-encoding
Bugfix: Some more encoding problems with attachments fixed
rabuzarus [Thu, 26 May 2016 23:51:50 +0000 (01:51 +0200)]
Merge pull request #2533 from annando/1605-frio-link
Frio: Added a link to the thread on the same server
Michael Vogel [Thu, 26 May 2016 21:23:24 +0000 (23:23 +0200)]
Frio: Added a link to the thread on the same server
Michael Vogel [Thu, 26 May 2016 21:22:30 +0000 (23:22 +0200)]
Bugfix: Some more encoding problems with attachments fixed
fabrixxm [Thu, 26 May 2016 09:35:22 +0000 (11:35 +0200)]
Merge pull request #2531 from rabuzarus/frio_merge
adding the experimental frio theme to friendica repo
Michael Vogel [Thu, 26 May 2016 05:36:02 +0000 (07:36 +0200)]
Merge pull request #2530 from strk/openid
Fix OpenID login
Michael Vogel [Thu, 26 May 2016 05:25:53 +0000 (07:25 +0200)]
Merge pull request #2522 from tobiasd/doc-settings2
clearing up the admin panel documentation
projects / friendica.git / log