]> git.mxchange.org Git - friendica.git/log
friendica.git
8 years agoFrio: Fix warnings in config page
fabrixxm [Fri, 27 May 2016 13:50:51 +0000 (15:50 +0200)]
Frio: Fix warnings in config page

8 years agoMerge pull request #2532 from annando/1605-attachment-encoding
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

8 years agoMerge pull request #2533 from annando/1605-frio-link
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

8 years agoFrio: 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

8 years agoBugfix: Some more encoding problems with attachments fixed
Michael Vogel [Thu, 26 May 2016 21:22:30 +0000 (23:22 +0200)]
Bugfix: Some more encoding problems with attachments fixed

8 years agoMerge pull request #2531 from rabuzarus/frio_merge
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

8 years agoMerge pull request #2530 from strk/openid
Michael Vogel [Thu, 26 May 2016 05:36:02 +0000 (07:36 +0200)]
Merge pull request #2530 from strk/openid

Fix OpenID login

8 years agoMerge pull request #2522 from tobiasd/doc-settings2
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

8 years agoSimplify openid query, and (needlessly) quote all fields
Sandro Santilli [Wed, 25 May 2016 14:06:16 +0000 (16:06 +0200)]
Simplify openid query, and (needlessly) quote all fields

Fields quoting was requested by rabuzarus

8 years agoMerge branch 'master' of ../save/merge/frio into frio_merge
rabuzarus [Wed, 25 May 2016 13:14:09 +0000 (15:14 +0200)]
Merge branch 'master' of ../save/merge/frio into frio_merge

8 years agorestructuring for PR for friendica main repo
rabuzarus [Wed, 25 May 2016 13:12:29 +0000 (15:12 +0200)]
restructuring for PR for friendica main repo

8 years agoFix OpenID login
Sandro Santilli [Wed, 25 May 2016 10:43:26 +0000 (12:43 +0200)]
Fix OpenID login

The problem was that while openid was stored not-normalized in the database,
the checking code was looking for a normalized form instead.

The commit removing normalization step on saving user preferences
was 8367cad, which might have left old users with normalized openid
and new users with non-normalized one.

This commit makes the checking code look for both normalized and not
normalized form, to be backward compatible.

8 years agoREADME: Add link to commit history
rabuzarus [Wed, 25 May 2016 06:45:15 +0000 (08:45 +0200)]
README: Add link to commit history

8 years agomark frio theme as experimental
rabuzarus [Wed, 25 May 2016 06:24:07 +0000 (08:24 +0200)]
mark frio theme as experimental

8 years agoRemove debug log
root [Tue, 24 May 2016 20:37:40 +0000 (22:37 +0200)]
Remove debug log

8 years agoDo not normalize openid url when logging in
root [Tue, 24 May 2016 20:36:51 +0000 (22:36 +0200)]
Do not normalize openid url when logging in

(since it isn't normalized when setting it via user settings)

NOTE: this broke with 8367cad

8 years agoMerge pull request #2529 from annando/1605-events
Tobias Diekershoff [Mon, 23 May 2016 16:06:09 +0000 (18:06 +0200)]
Merge pull request #2529 from annando/1605-events

Issue 2277: Events can now be edited and deleted

8 years agoMerge pull request #2523 from annando/1605-bugfix-notificatoon
Tobias Diekershoff [Mon, 23 May 2016 14:57:23 +0000 (16:57 +0200)]
Merge pull request #2523 from annando/1605-bugfix-notificatoon

Bugfix: Under certain circumstances notifications were send

8 years agosmall fixes
Tobias Diekershoff [Mon, 23 May 2016 12:05:27 +0000 (14:05 +0200)]
small fixes

8 years agoremote_self
Tobias Diekershoff [Mon, 23 May 2016 07:05:49 +0000 (09:05 +0200)]
remote_self

8 years agoplacement of the logfiles
Tobias Diekershoff [Mon, 23 May 2016 07:03:57 +0000 (09:03 +0200)]
placement of the logfiles

8 years agoMerge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon
Michael Vogel [Mon, 23 May 2016 04:49:31 +0000 (06:49 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon

8 years agoMerge pull request #2527 from annando/1605-entities-link
Tobias Diekershoff [Mon, 23 May 2016 04:13:29 +0000 (06:13 +0200)]
Merge pull request #2527 from annando/1605-entities-link

Bugfix: The url in attachments had problems with entities

8 years agoMerge pull request #2526 from annando/issue-2063
Tobias Diekershoff [Mon, 23 May 2016 04:11:17 +0000 (06:11 +0200)]
Merge pull request #2526 from annando/issue-2063

Issue 2063: Define the constant SIGTERM if not defined

8 years agoRemove some test logging
Michael Vogel [Sun, 22 May 2016 16:22:05 +0000 (18:22 +0200)]
Remove some test logging

8 years agoIssue 2277: changes to events are now distributed.
Michael Vogel [Sun, 22 May 2016 16:16:47 +0000 (18:16 +0200)]
Issue 2277: changes to events are now distributed.

8 years agoEvents: Now with guid.
Michael Vogel [Sun, 22 May 2016 16:05:01 +0000 (18:05 +0200)]
Events: Now with guid.

8 years agoBugfix: The url in attachments had problems with entities
Michael Vogel [Sun, 22 May 2016 11:46:05 +0000 (13:46 +0200)]
Bugfix: The url in attachments had problems with entities

8 years agoIssue 2063: Define the constant SIGTERM if not defined
Michael Vogel [Sun, 22 May 2016 10:31:32 +0000 (12:31 +0200)]
Issue 2063: Define the constant SIGTERM if not defined

8 years agoBugfix: Under certain circumstances notifications were send
Michael Vogel [Sat, 21 May 2016 11:19:30 +0000 (13:19 +0200)]
Bugfix: Under certain circumstances notifications were send

8 years agoTypo
Tobias Diekershoff [Sat, 21 May 2016 04:02:36 +0000 (06:02 +0200)]
Typo

8 years agoadded short intoduction of the term admin panel
Tobias Diekershoff [Fri, 20 May 2016 18:09:45 +0000 (20:09 +0200)]
added short intoduction of the term admin panel

8 years agorewrite of the doc/settings.md
Tobias Diekershoff [Fri, 20 May 2016 18:06:37 +0000 (20:06 +0200)]
rewrite of the doc/settings.md

8 years agoprivate messages: fix 2 - contact photos aren't visible
rabuzarus [Fri, 20 May 2016 01:49:53 +0000 (03:49 +0200)]
private messages: fix 2 - contact photos aren't visible

8 years agoprivate messages: fix - contact photos aren't visible
rabuzarus [Fri, 20 May 2016 01:45:50 +0000 (03:45 +0200)]
private messages: fix - contact photos aren't visible

8 years agoprivate messages: some work for the standard messages overview
rabuzarus [Fri, 20 May 2016 01:40:53 +0000 (03:40 +0200)]
private messages: some work for the standard messages overview

8 years agoohh some spelling mistakes heading is written only with one d :-)
rabuzarus [Thu, 19 May 2016 23:50:56 +0000 (01:50 +0200)]
ohh some spelling mistakes heading is written only with one d :-)

8 years agoprivate mail: insert some space between conversation and textarea
rabuzarus [Thu, 19 May 2016 23:46:33 +0000 (01:46 +0200)]
private mail: insert some space between conversation and textarea

8 years agoMerge pull request #2521 from tobiasd/20160519-de
Michael Vogel [Thu, 19 May 2016 10:19:57 +0000 (12:19 +0200)]
Merge pull request #2521 from tobiasd/20160519-de

DE translation THX Abrax

8 years agoDE translation THX Abrax
Tobias Diekershoff [Thu, 19 May 2016 10:01:38 +0000 (12:01 +0200)]
DE translation THX Abrax

8 years agoMerge pull request #2519 from tobiasd/20160519-messagespo
Michael Vogel [Thu, 19 May 2016 05:37:31 +0000 (07:37 +0200)]
Merge pull request #2519 from tobiasd/20160519-messagespo

regenerated master messages.po file

8 years agoMerge pull request #2520 from annando/1605-probe_feed
Tobias Diekershoff [Thu, 19 May 2016 04:54:17 +0000 (06:54 +0200)]
Merge pull request #2520 from annando/1605-probe_feed

Bugfix: Feeds weren't detected correctly

8 years agoBugfix: Feeds weren't detected correctly
Michael Vogel [Wed, 18 May 2016 20:50:15 +0000 (22:50 +0200)]
Bugfix: Feeds weren't detected correctly

8 years agoregenerated master messages.po file
Tobias Diekershoff [Wed, 18 May 2016 20:43:49 +0000 (22:43 +0200)]
regenerated master messages.po file

8 years agofix missing semicolon in some nbsp
rabuzarus [Wed, 18 May 2016 13:51:08 +0000 (15:51 +0200)]
fix missing semicolon in some nbsp

8 years agofix missing closing h4 tag in wall_thread.tpl
rabuzarus [Wed, 18 May 2016 13:40:37 +0000 (15:40 +0200)]
fix missing closing h4 tag in wall_thread.tpl

8 years agoshared conten divt: move js out from templates into theme.js
rabuzarus [Wed, 18 May 2016 12:59:35 +0000 (14:59 +0200)]
shared conten divt: move js out from templates into theme.js

8 years agojot: show preview only if preview is activatet in the settings
rabuzarus [Wed, 18 May 2016 12:58:15 +0000 (14:58 +0200)]
jot: show preview only if preview is activatet in the settings

8 years agolittle js change for network colorbox images
rabuzarus [Mon, 16 May 2016 22:35:32 +0000 (00:35 +0200)]
little js change for network colorbox images

8 years agoMerge pull request #2517 from fabrixxm/feature-2516
Tobias Diekershoff [Mon, 16 May 2016 12:56:17 +0000 (14:56 +0200)]
Merge pull request #2517 from fabrixxm/feature-2516

Make user table in admin sortable via table headers

8 years agoMake user table in admin sortable via table headers
Fabrixxm [Mon, 16 May 2016 12:38:00 +0000 (14:38 +0200)]
Make user table in admin sortable via table headers

new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.

8 years agoMerge pull request #2513 from annando/1605-diaspora-relay
Tobias Diekershoff [Mon, 16 May 2016 05:57:16 +0000 (07:57 +0200)]
Merge pull request #2513 from annando/1605-diaspora-relay

Support for comments for the Diaspora relay system

8 years agoMerge pull request #2514 from annando/1605-plaintext
Tobias Diekershoff [Mon, 16 May 2016 05:56:42 +0000 (07:56 +0200)]
Merge pull request #2514 from annando/1605-plaintext

Bugfix for shares in the plaintext function

8 years agoupdated README: added Installation Requirements
rabuzarus [Sun, 15 May 2016 12:14:56 +0000 (14:14 +0200)]
updated README: added Installation Requirements

8 years agorename the page template modal.php to none.php because it can be used for more than...
rabuzarus [Sun, 15 May 2016 11:41:37 +0000 (13:41 +0200)]
rename the page template modal.php to none.php because it can be used for more than modals

8 years agoThere were undecoded entities in the title
Michael Vogel [Sun, 15 May 2016 08:36:56 +0000 (10:36 +0200)]
There were undecoded entities in the title

8 years agoMerge pull request #2515 from rabuzarus/key_fix
Michael Vogel [Sun, 15 May 2016 08:35:16 +0000 (10:35 +0200)]
Merge pull request #2515 from rabuzarus/key_fix

photo.php: correct misspelling of an array key

8 years agophoto.php: correct misspelling of an array key
rabuzarus [Sun, 15 May 2016 00:37:18 +0000 (02:37 +0200)]
photo.php: correct misspelling of an array key

8 years agoBugfix for shares in the plaintext function
Michael Vogel [Fri, 13 May 2016 20:23:46 +0000 (22:23 +0200)]
Bugfix for shares in the plaintext function

8 years agoSupport for comments for the Diaspora relay system
Michael Vogel [Fri, 13 May 2016 20:19:31 +0000 (22:19 +0200)]
Support for comments for the Diaspora relay system

8 years agoMerge pull request #2511 from rabuzarus/1205_photo_live_update
Tobias Diekershoff [Fri, 13 May 2016 05:57:13 +0000 (07:57 +0200)]
Merge pull request #2511 from rabuzarus/1205_photo_live_update

1205 photo live update

8 years agophotos view: fix js error - forgot to delete this testing stuff
rabuzarus [Thu, 12 May 2016 23:34:56 +0000 (01:34 +0200)]
photos view: fix js error - forgot to delete this testing stuff

8 years agophotos view: fix js error with undefined variable
rabuzarus [Thu, 12 May 2016 23:26:07 +0000 (01:26 +0200)]
photos view: fix js error with undefined variable

8 years agoinfinite scroll: include updated code from friendica develop branch
rabuzarus [Thu, 12 May 2016 18:30:08 +0000 (20:30 +0200)]
infinite scroll: include updated code from friendica develop branch

8 years agoMerge pull request #2510 from rabuzarus/1005_js_pageload
Tobias Diekershoff [Thu, 12 May 2016 05:47:26 +0000 (07:47 +0200)]
Merge pull request #2510 from rabuzarus/1005_js_pageload

infinite_scroll: move js from index.php to main.js

8 years agosome more work on private messages mail_display.tpl & mail_conv.tpl
rabuzarus [Thu, 12 May 2016 00:49:55 +0000 (02:49 +0200)]
some more work on private messages mail_display.tpl & mail_conv.tpl

8 years agoprv message: fix message body was not sent
rabuzarus [Wed, 11 May 2016 20:05:01 +0000 (22:05 +0200)]
prv message: fix message body was not sent

8 years agobackground: set background-attachment to fixed
rabuzarus [Wed, 11 May 2016 17:20:57 +0000 (19:20 +0200)]
background: set background-attachment to fixed

8 years agoitem deletion: fix - little mistake in the templates
rabuzarus [Wed, 11 May 2016 15:07:38 +0000 (17:07 +0200)]
item deletion: fix - little mistake in the templates

8 years agoitem deletion: fix for don't showing the delete button if item is getting unchecked...
rabuzarus [Wed, 11 May 2016 14:53:49 +0000 (16:53 +0200)]
item deletion: fix for don't showing the delete button if item is getting unchecked but other items are still checked

8 years agoitem deletion: use js to delete items. so we don't have to reload the page
rabuzarus [Wed, 11 May 2016 14:04:11 +0000 (16:04 +0200)]
item deletion: use js to delete items. so we don't have to reload the page

8 years agoinfinite_scroll: move js from index.php to main.js
rabuzarus [Tue, 10 May 2016 23:52:05 +0000 (01:52 +0200)]
infinite_scroll: move js from index.php to main.js

8 years agotheme-settings: Add a note for the background Image
rabuzarus [Tue, 10 May 2016 15:30:06 +0000 (17:30 +0200)]
theme-settings: Add a note for the background Image

8 years agotheme-settings: background image can be set with fbrowser
rabuzarus [Mon, 9 May 2016 21:30:09 +0000 (23:30 +0200)]
theme-settings: background image can be set with fbrowser

8 years agofilebrowser: massive improvements (fix https://github.com/rabuzarus/frio/issues/3...
rabuzarus [Mon, 9 May 2016 19:08:11 +0000 (21:08 +0200)]
filebrowser: massive improvements (fix https://github.com/rabuzarus/frio/issues/3 , integrate fbrowser into jot)

8 years agohead.tpl move strings to js strings into the html <head> so we can move the js script...
rabuzarus [Sat, 7 May 2016 23:31:30 +0000 (01:31 +0200)]
head.tpl move strings to js strings into the html <head> so we can move the js scripts out of the template

8 years agoSome code cleanup - move js and css to head.tpl -> this stuff should be done in theme...
rabuzarus [Sat, 7 May 2016 22:29:33 +0000 (00:29 +0200)]
Some code cleanup - move js and css to head.tpl -> this stuff should be done in theme.php but does need changings in core (this would allow theme developers more structured working)

8 years agoappend poke and private message template
rabuzarus [Sat, 7 May 2016 02:41:57 +0000 (04:41 +0200)]
append poke and private message template

8 years agoapply bootstrap media fix (maybe we remove it again, lets test it)
rabuzarus [Fri, 6 May 2016 22:34:18 +0000 (00:34 +0200)]
apply bootstrap media fix (maybe we remove it again, lets test it)

8 years agofix: tooltips now appear also on ajax content
rabuzarus [Fri, 6 May 2016 22:25:40 +0000 (00:25 +0200)]
fix: tooltips now appear also on ajax content

8 years agohovercard: some css cleanup (remove unneeded css)
rabuzarus [Fri, 6 May 2016 20:58:26 +0000 (22:58 +0200)]
hovercard: some css cleanup (remove unneeded css)

8 years agohovercard: some polishing
rabuzarus [Fri, 6 May 2016 20:28:12 +0000 (22:28 +0200)]
hovercard: some polishing

8 years agohovercard: fix hover-card does now working with ajax loaded content
rabuzarus [Fri, 6 May 2016 18:48:12 +0000 (20:48 +0200)]
hovercard: fix hover-card does now working with ajax loaded content

8 years agoMerge pull request #2507 from annando/1605-hidewall
Tobias Diekershoff [Fri, 6 May 2016 17:28:55 +0000 (19:28 +0200)]
Merge pull request #2507 from annando/1605-hidewall

Better implementation of "hidewall" with feeds

8 years agoAdded documentation
Michael Vogel [Fri, 6 May 2016 16:30:34 +0000 (18:30 +0200)]
Added documentation

8 years agoThe feed header is now displayed even with "hidewall" activated
Michael Vogel [Fri, 6 May 2016 16:27:19 +0000 (18:27 +0200)]
The feed header is now displayed even with "hidewall" activated

8 years agohovercard: better placement management
rabuzarus [Fri, 6 May 2016 15:32:07 +0000 (17:32 +0200)]
hovercard: better placement management

8 years agomove some js to have more structure
rabuzarus [Fri, 6 May 2016 14:48:06 +0000 (16:48 +0200)]
move some js to have more structure

8 years agohovercard: add cache for contact data results
rabuzarus [Fri, 6 May 2016 14:37:04 +0000 (16:37 +0200)]
hovercard: add cache for contact data results

8 years agoBetter implementation of "hidewall"
Michael Vogel [Fri, 6 May 2016 09:04:21 +0000 (11:04 +0200)]
Better implementation of "hidewall"

8 years agoMerge pull request #2505 from annando/1605-diaspora-reshare
Tobias Diekershoff [Fri, 6 May 2016 07:45:49 +0000 (09:45 +0200)]
Merge pull request #2505 from annando/1605-diaspora-reshare

Diaspora: Reshares of non native reshares now look better

8 years agoDiaspora: Reshares of non native reshares now look better
Michael Vogel [Fri, 6 May 2016 06:22:27 +0000 (08:22 +0200)]
Diaspora: Reshares of non native reshares now look better

8 years agoMerge pull request #2503 from annando/1605-hide-profile
Tobias Diekershoff [Fri, 6 May 2016 05:45:44 +0000 (07:45 +0200)]
Merge pull request #2503 from annando/1605-hide-profile

Better handling of hidden profiles

8 years agoMerge pull request #2504 from annando/1605-share2
Tobias Diekershoff [Fri, 6 May 2016 05:42:35 +0000 (07:42 +0200)]
Merge pull request #2504 from annando/1605-share2

Avoid warning messages at "strstr"

8 years agopoke: fix poke dialog - js tests now if there is already a questionmark in the url
rabuzarus [Fri, 6 May 2016 00:19:45 +0000 (02:19 +0200)]
poke: fix poke dialog - js tests now if there is already a questionmark in the url

8 years agohovercard: cache raw content of the template so we don't have to request it everytime...
rabuzarus [Thu, 5 May 2016 21:48:52 +0000 (23:48 +0200)]
hovercard: cache raw content of the template so we don't have to request it everytime from the server

8 years agomake the addon frio_hovercard working with the frio theme (Note: some changes which...
rabuzarus [Thu, 5 May 2016 19:10:08 +0000 (21:10 +0200)]
make the addon frio_hovercard working with the frio theme (Note: some changes which belong to the addon itself are going to the frio theme repository, because it's not planned to use the frio_hovercard addon without the frio theme and and vice versa.
The addon frio_hovercard was initatet because we need a new module for the frio theme

8 years agoAvoid warning messages at "strstr"
Michael Vogel [Thu, 5 May 2016 18:36:23 +0000 (20:36 +0200)]
Avoid warning messages at "strstr"

8 years agoprovide a custom jsmart because friendica delimters diddn't work with the original
rabuzarus [Thu, 5 May 2016 16:39:15 +0000 (18:39 +0200)]
provide a custom jsmart because friendica delimters diddn't work with the original

8 years agoUpdate the global contact entries for local users on a regular base
Michael Vogel [Thu, 5 May 2016 13:38:28 +0000 (15:38 +0200)]
Update the global contact entries for local users on a regular base