]> git.mxchange.org Git - friendica.git/log
friendica.git
11 years agoonly change parents when parents are changed.
Michael Vogel [Mon, 28 Jan 2013 00:22:00 +0000 (01:22 +0100)]
only change parents when parents are changed.

11 years agoostatus auto completion now seems to work.
Michael Vogel [Mon, 28 Jan 2013 00:16:51 +0000 (01:16 +0100)]
ostatus auto completion now seems to work.

11 years agoNew function to complete threads from ostatus postings
Michael Vogel [Sun, 27 Jan 2013 22:25:04 +0000 (23:25 +0100)]
New function to complete threads from ostatus postings

11 years agoBugfixing after adding timestamps
Michael Vogel [Sun, 27 Jan 2013 12:57:44 +0000 (13:57 +0100)]
Bugfixing after adding timestamps

11 years agoSeveral improvements for performance measuring
Michael Vogel [Sat, 26 Jan 2013 17:35:39 +0000 (18:35 +0100)]
Several improvements for performance measuring

11 years agoPerformance: Adding several variables for performance measuring.
Michael - piratica.eu [Sat, 26 Jan 2013 15:46:43 +0000 (16:46 +0100)]
Performance: Adding several variables for performance measuring.

11 years agoMerge branch 'master' of https://github.com/annando/friendica
Michael - piratica.eu [Sun, 20 Jan 2013 13:17:09 +0000 (14:17 +0100)]
Merge branch 'master' of https://github.com/annando/friendica

Conflicts:
include/poller.php

11 years agoDiaspora: Auto-adding users as friend who already sharing with us
Michael - piratica.eu [Sun, 20 Jan 2013 13:08:28 +0000 (14:08 +0100)]
Diaspora: Auto-adding users as friend who already sharing with us

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 20 Jan 2013 13:07:57 +0000 (14:07 +0100)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
boot.php
include/items.php
update.php

11 years agoPreloading of items in the cache when receiving them.
Michael Vogel [Thu, 17 Jan 2013 22:20:40 +0000 (23:20 +0100)]
Preloading of items in the cache when receiving them.

11 years agoevents with no finish date don't appear in calendar
friendica [Wed, 16 Jan 2013 11:16:45 +0000 (03:16 -0800)]
events with no finish date don't appear in calendar

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 15 Jan 2013 22:59:41 +0000 (14:59 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agoprovide a date indication in reshared content
friendica [Tue, 15 Jan 2013 22:58:50 +0000 (14:58 -0800)]
provide a date indication in reshared content

11 years agoMerge pull request #587 from oohlaf/fixes
Olaf Conradi [Tue, 15 Jan 2013 09:34:15 +0000 (01:34 -0800)]
Merge pull request #587 from oohlaf/fixes

Add ico, ttf and svg to skip the front controller

11 years agoAdd ttf and svg to skip the front controller
Olaf Conradi [Tue, 15 Jan 2013 09:28:24 +0000 (10:28 +0100)]
Add ttf and svg to skip the front controller

This makes themes that rely on the correct mimetype work.

11 years agoMerge pull request #586 from fermionic/20130114-maintenance-mode
fermionic [Tue, 15 Jan 2013 03:35:46 +0000 (19:35 -0800)]
Merge pull request #586 from fermionic/20130114-maintenance-mode

check plugins in separate function

11 years agoremove commented-out check_config()
Zach Prezkuta [Tue, 15 Jan 2013 03:34:28 +0000 (20:34 -0700)]
remove commented-out check_config()

11 years agocheck plugins in separate function
Zach Prezkuta [Tue, 15 Jan 2013 03:31:32 +0000 (20:31 -0700)]
check plugins in separate function

11 years agoMerge pull request #585 from fermionic/20130114-maintenance-mode
fermionic [Tue, 15 Jan 2013 02:18:34 +0000 (18:18 -0800)]
Merge pull request #585 from fermionic/20130114-maintenance-mode

add maintenance mode

11 years agorun check_config() in a separate process
Zach Prezkuta [Mon, 14 Jan 2013 23:58:32 +0000 (16:58 -0700)]
run check_config() in a separate process

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 14 Jan 2013 23:51:31 +0000 (15:51 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agoconfig cli will also work with Friendica without change - so bringing it over
friendica [Mon, 14 Jan 2013 23:50:39 +0000 (15:50 -0800)]
config cli will also work with Friendica without change - so bringing it over

11 years agomodule to show system down message
Zach Prezkuta [Mon, 14 Jan 2013 23:48:01 +0000 (16:48 -0700)]
module to show system down message

11 years agoadd maintenance mode
Zach Prezkuta [Mon, 14 Jan 2013 23:35:41 +0000 (16:35 -0700)]
add maintenance mode

11 years agoMerge pull request #584 from fermionic/20130113-multiple-delete-comments
fermionic [Sun, 13 Jan 2013 19:44:20 +0000 (11:44 -0800)]
Merge pull request #584 from fermionic/20130113-multiple-delete-comments

comments inherit pagedropping state of the top-level

11 years agoRedirects sometimes only seems to send the hostname and no path. "fetch_url" respects...
Michael Vogel [Sun, 13 Jan 2013 17:51:48 +0000 (18:51 +0100)]
Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this.

11 years agocomments inherit pagedropping state of the top-level
Zach Prezkuta [Sun, 13 Jan 2013 17:51:19 +0000 (10:51 -0700)]
comments inherit pagedropping state of the top-level

11 years agoSearching for tags has been enabled in all places. The tag detection has been improve...
Michael Vogel [Sun, 13 Jan 2013 16:13:01 +0000 (17:13 +0100)]
Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds.

11 years agoSome more function calls to ensure that the tags are deleted when an item is deleted
Michael Vogel [Sun, 13 Jan 2013 14:11:06 +0000 (15:11 +0100)]
Some more function calls to ensure that the tags are deleted when an item is deleted

11 years agoAdding the tag creating function to the function when a photo is tagged
Michael Vogel [Sun, 13 Jan 2013 14:05:24 +0000 (15:05 +0100)]
Adding the tag creating function to the function when a photo is tagged

11 years agoChanging the tag system to the "term" table.
Michael Vogel [Sun, 13 Jan 2013 13:50:55 +0000 (14:50 +0100)]
Changing the tag system to the "term" table.

11 years agoZH-CN: update to the strings
Tobias Diekershoff [Sun, 13 Jan 2013 11:55:13 +0000 (12:55 +0100)]
ZH-CN: update to the strings

11 years agoMentions are now displayed much faster. Attention: The related database update can...
Michael Vogel [Sun, 13 Jan 2013 08:37:15 +0000 (09:37 +0100)]
Mentions are now displayed much faster. Attention: The related database update can last more than one minute.
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 12 Jan 2013 23:09:35 +0000 (15:09 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agofix live update on display page
friendica [Sat, 12 Jan 2013 23:08:59 +0000 (15:08 -0800)]
fix live update on display page

11 years agoMerge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
friendica [Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)]
Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements

fixes and tweaks to Smarty processing

11 years agoMerge pull request #582 from fermionic/20130112-various-fixes
friendica [Sat, 12 Jan 2013 20:24:51 +0000 (12:24 -0800)]
Merge pull request #582 from fermionic/20130112-various-fixes

Various fixes

11 years agoMerge pull request #583 from fermionic/20130112-diaspora-photo-queue
friendica [Sat, 12 Jan 2013 20:16:12 +0000 (12:16 -0800)]
Merge pull request #583 from fermionic/20130112-diaspora-photo-queue

Diaspora photo queue

11 years agofix leak
Zach Prezkuta [Sat, 12 Jan 2013 13:56:45 +0000 (06:56 -0700)]
fix leak

11 years agogive post a chance to arrive before rejecting photos from Diaspora
Zach Prezkuta [Sat, 12 Jan 2013 13:52:15 +0000 (06:52 -0700)]
give post a chance to arrive before rejecting photos from Diaspora

11 years ago* Add MIME types for file attachments
Zach Prezkuta [Sat, 12 Jan 2013 13:31:32 +0000 (06:31 -0700)]
* Add MIME types for file attachments
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files

11 years agofixes and tweaks to Smarty processing
Zach Prezkuta [Sat, 12 Jan 2013 12:58:54 +0000 (05:58 -0700)]
fixes and tweaks to Smarty processing

11 years agoMerge pull request #580 from fermionic/20130111-better-conversion-scripts
fermionic [Sat, 12 Jan 2013 00:30:25 +0000 (16:30 -0800)]
Merge pull request #580 from fermionic/20130111-better-conversion-scripts

automatic, command-line conversion

11 years agonewline at end of header
Zach Prezkuta [Fri, 11 Jan 2013 17:00:10 +0000 (10:00 -0700)]
newline at end of header

11 years agoadd warning message about automatically generated templates
Zach Prezkuta [Fri, 11 Jan 2013 16:57:11 +0000 (09:57 -0700)]
add warning message about automatically generated templates

11 years agoautomatic, command-line conversion
Zach Prezkuta [Fri, 11 Jan 2013 16:41:45 +0000 (09:41 -0700)]
automatic, command-line conversion

11 years agoMerge pull request #579 from 23n/patch-4
tobiasd [Fri, 11 Jan 2013 14:57:46 +0000 (06:57 -0800)]
Merge pull request #579 from 23n/patch-4

no Hilde is welcome too :-)

merged

11 years agotypo correction
Oliver [Fri, 11 Jan 2013 13:15:17 +0000 (14:15 +0100)]
typo correction

we don't want to drop Hilde

11 years ago modified: view/theme/smoothly/css/typography.css
pixelroot [Fri, 11 Jan 2013 09:56:14 +0000 (10:56 +0100)]
modified:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agoThe search now searches in the new tag table
Michael Vogel [Fri, 11 Jan 2013 07:51:58 +0000 (08:51 +0100)]
The search now searches in the new tag table

11 years agoApp::get_template_engine() redeclared
friendica [Fri, 11 Jan 2013 06:34:25 +0000 (22:34 -0800)]
App::get_template_engine() redeclared

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 11 Jan 2013 06:27:53 +0000 (22:27 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Fri, 11 Jan 2013 06:27:41 +0000 (22:27 -0800)]
rev update

11 years agoMerge pull request #578 from fermionic/20130110-update-smarty-conversion-script
friendica [Fri, 11 Jan 2013 06:22:49 +0000 (22:22 -0800)]
Merge pull request #578 from fermionic/20130110-update-smarty-conversion-script

use Python 2.4 compatible script; update Smarty templates

11 years agoupdate a few more Smarty templates
Zach Prezkuta [Fri, 11 Jan 2013 05:36:44 +0000 (22:36 -0700)]
update a few more Smarty templates

11 years agouse Python 2.4 compatible script; update Smarty templates
Zach Prezkuta [Fri, 11 Jan 2013 05:34:23 +0000 (22:34 -0700)]
use Python 2.4 compatible script; update Smarty templates

11 years agoMerge pull request #577 from fermionic/20130110-restore-intl-smarty
friendica [Fri, 11 Jan 2013 05:05:00 +0000 (21:05 -0800)]
Merge pull request #577 from fermionic/20130110-restore-intl-smarty

Restore intl smarty

11 years agoremove now-unnecessary line in text.php
Zach Prezkuta [Fri, 11 Jan 2013 04:48:33 +0000 (21:48 -0700)]
remove now-unnecessary line in text.php

11 years agoallow Smarty use on international templates
Zach Prezkuta [Fri, 11 Jan 2013 04:46:48 +0000 (21:46 -0700)]
allow Smarty use on international templates

11 years agoPreparations for a new tag structure. Tags are now stored in a dedicated table.
Michael Vogel [Fri, 11 Jan 2013 00:20:16 +0000 (01:20 +0100)]
Preparations for a new tag structure. Tags are now stored in a dedicated table.

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 10 Jan 2013 09:09:02 +0000 (01:09 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Thu, 10 Jan 2013 09:08:36 +0000 (01:08 -0800)]
rev update

11 years agoZH-CN: update to the strings
Tobias Diekershoff [Thu, 10 Jan 2013 05:49:35 +0000 (06:49 +0100)]
ZH-CN: update to the strings

11 years agoDE: update to the strings
Tobias Diekershoff [Thu, 10 Jan 2013 05:48:54 +0000 (06:48 +0100)]
DE: update to the strings

11 years agoNow the third most likely languages are shown.
Michael Vogel [Wed, 9 Jan 2013 19:54:18 +0000 (20:54 +0100)]
Now the third most likely languages are shown.
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.

11 years agoupdate smarty diabook templates bug 525
friendica [Tue, 8 Jan 2013 22:45:19 +0000 (14:45 -0800)]
update smarty diabook templates bug 525

11 years agomissing session template_engine calls
friendica [Tue, 8 Jan 2013 20:24:13 +0000 (12:24 -0800)]
missing session template_engine calls

11 years agobypass smarty wherever using intltext_templates (install, register, friend confirmati...
friendica [Tue, 8 Jan 2013 04:14:00 +0000 (20:14 -0800)]
bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)

11 years agoMerge pull request #575 from beardy-unixer/master
friendica [Sun, 6 Jan 2013 03:32:11 +0000 (19:32 -0800)]
Merge pull request #575 from beardy-unixer/master

If we find a home.html, also look for a home.css

11 years agoIf we find a home.html, also look for a home.css
Thomas Willingham [Sat, 5 Jan 2013 14:31:10 +0000 (14:31 +0000)]
If we find a home.html, also look for a home.css

11 years agoCS: update to the strings
Tobias Diekershoff [Sat, 5 Jan 2013 08:29:26 +0000 (09:29 +0100)]
CS: update to the strings

11 years agoemail header encoding everywhere
friendica [Fri, 4 Jan 2013 23:47:29 +0000 (15:47 -0800)]
email header encoding everywhere

11 years agopreserve multiple newlines - see discussion at https://github.com/friendica/friendica...
friendica [Fri, 4 Jan 2013 23:21:05 +0000 (15:21 -0800)]
preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 4 Jan 2013 23:14:33 +0000 (15:14 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Fri, 4 Jan 2013 23:14:00 +0000 (15:14 -0800)]
rev update

11 years agoMerge pull request #570 from annando/master
friendica [Fri, 4 Jan 2013 23:13:09 +0000 (15:13 -0800)]
Merge pull request #570 from annando/master

Vier, caches and "share" via API

11 years agoMerge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init
friendica [Fri, 4 Jan 2013 22:36:47 +0000 (14:36 -0800)]
Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init

Finalize theme decision in a module's _init function

11 years agoPL: update to the strings
Tobias Diekershoff [Fri, 4 Jan 2013 08:18:21 +0000 (09:18 +0100)]
PL: update to the strings

11 years agoWe haven't Got Zot
Thomas Willingham [Thu, 3 Jan 2013 20:18:43 +0000 (20:18 +0000)]
We haven't Got Zot

11 years agobetter location for toggle_mobile code
Zach Prezkuta [Thu, 3 Jan 2013 18:16:10 +0000 (11:16 -0700)]
better location for toggle_mobile code

11 years agoprofile_uid bug in boot.php
Zach Prezkuta [Thu, 3 Jan 2013 17:53:11 +0000 (10:53 -0700)]
profile_uid bug in boot.php

11 years agonever use profile_load outside of a module's _init() function
Zach Prezkuta [Thu, 3 Jan 2013 17:47:45 +0000 (10:47 -0700)]
never use profile_load outside of a module's _init() function

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 3 Jan 2013 11:50:17 +0000 (03:50 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agoIf we're going to encode the email headers, we probably should use the encoded versio...
friendica [Thu, 3 Jan 2013 11:47:08 +0000 (03:47 -0800)]
If we're going to encode the email headers, we probably should use the encoded version rather than the original

11 years agoMerge pull request #573 from oohlaf/fixes
Olaf Conradi [Wed, 2 Jan 2013 13:32:19 +0000 (05:32 -0800)]
Merge pull request #573 from oohlaf/fixes

Don't add src attributes inside acl-template

11 years agoNo need to remove data-src attributes
Olaf Conradi [Wed, 2 Jan 2013 13:28:13 +0000 (14:28 +0100)]
No need to remove data-src attributes

Better comment string also

11 years agoMerge branch 'master' of git://github.com/friendica/friendica
Tobias Diekershoff [Wed, 2 Jan 2013 10:10:59 +0000 (11:10 +0100)]
Merge branch 'master' of git://github.com/friendica/friendica

11 years agoDE: update to the strings
Tobias Diekershoff [Wed, 2 Jan 2013 10:10:24 +0000 (11:10 +0100)]
DE: update to the strings

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 2 Jan 2013 01:33:33 +0000 (17:33 -0800)]
Merge https://github.com/friendica/friendica into pull

11 years agorev update
friendica [Wed, 2 Jan 2013 01:32:46 +0000 (17:32 -0800)]
rev update

11 years agoMerge pull request #572 from cvogeley/master
fermionic [Tue, 1 Jan 2013 23:12:45 +0000 (15:12 -0800)]
Merge pull request #572 from cvogeley/master

Fix registration form

11 years agorevert one change
Christian Vogeley [Tue, 1 Jan 2013 22:47:56 +0000 (23:47 +0100)]
revert one change

11 years agoChange templates remove var modifiers
Christian Vogeley [Tue, 1 Jan 2013 22:41:26 +0000 (23:41 +0100)]
Change templates remove var modifiers

11 years ago.
Christian Vogeley [Tue, 1 Jan 2013 21:44:02 +0000 (22:44 +0100)]
.

11 years agoMove HTML part of oid to template + replace outside the tpl
Christian Vogeley [Tue, 1 Jan 2013 21:40:05 +0000 (22:40 +0100)]
Move HTML part of oid to template + replace outside the tpl

11 years agoDE: update to the strings
Tobias Diekershoff [Tue, 1 Jan 2013 21:25:55 +0000 (22:25 +0100)]
DE: update to the strings

11 years ago.
Christian Vogeley [Tue, 1 Jan 2013 20:08:30 +0000 (21:08 +0100)]
.

11 years agoFix registration form
Christian Vogeley [Tue, 1 Jan 2013 20:05:24 +0000 (21:05 +0100)]
Fix registration form

11 years ago modified: view/theme/smoothly/style.css
pixelroot [Tue, 1 Jan 2013 15:42:52 +0000 (16:42 +0100)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 31 Dec 2012 22:54:31 +0000 (14:54 -0800)]
Merge https://github.com/friendica/friendica into pull