03ec6cabda
PL: update to the strings
2013-01-22 08:01:25 +01:00
da12177aea
PL: update to the strings
2013-01-21 08:05:57 +01:00
Michael - piratica.eu
cc9ce39e3f
Merge branch 'master' of https://github.com/annando/friendica
...
Conflicts:
include/poller.php
2013-01-20 14:17:09 +01:00
Michael - piratica.eu
7ab335c9d6
Diaspora: Auto-adding users as friend who already sharing with us
2013-01-20 14:08:28 +01:00
Michael Vogel
4e3d0018c6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/items.php
update.php
2013-01-20 14:07:57 +01:00
8c04dde935
a README for the translation process
2013-01-20 08:58:51 +01:00
95f58426d8
DE: update to the strings
2013-01-19 15:36:09 +01:00
friendica
759f36e7e8
Merge pull request #588 from fermionic/20130118-update-db-error-on-fresh-install
...
insidious set_config bug
2013-01-19 03:59:49 -08:00
Zach Prezkuta
bf26af5ac6
insidious set_config bug
2013-01-18 23:38:49 -07:00
friendica
83448507b8
Merge https://github.com/friendica/friendica into pull
2013-01-18 17:38:56 -08:00
friendica
20eb767b7e
don't run two processes for every web access (noticed that dbupdate is always started as a background task under normal operation).
2013-01-18 17:37:45 -08:00
406692c7c6
DE: update to the strings
2013-01-18 12:40:44 +01:00
01875fff5b
PL: update to the strings
2013-01-18 12:40:24 +01:00
605f94f790
ZH-CN: update to the strings
2013-01-18 12:39:55 +01:00
Michael Vogel
82c00660e0
Preloading of items in the cache when receiving them.
2013-01-17 23:20:40 +01:00
friendica
3742d0d5ba
events with no finish date don't appear in calendar
2013-01-16 03:16:45 -08:00
friendica
e45de3503a
Merge https://github.com/friendica/friendica into pull
2013-01-15 14:59:41 -08:00
friendica
30f1fb2c4d
provide a date indication in reshared content
2013-01-15 14:58:50 -08:00
Olaf Conradi
3a89258d8e
Merge pull request #587 from oohlaf/fixes
...
Add ico, ttf and svg to skip the front controller
2013-01-15 01:34:15 -08:00
Olaf Conradi
492a42eebe
Add ttf and svg to skip the front controller
...
This makes themes that rely on the correct mimetype work.
2013-01-15 10:28:24 +01:00
fermionic
b42427d576
Merge pull request #586 from fermionic/20130114-maintenance-mode
...
check plugins in separate function
2013-01-14 19:35:46 -08:00
Zach Prezkuta
c32f754b6e
remove commented-out check_config()
2013-01-14 20:34:28 -07:00
Zach Prezkuta
6d77237f06
check plugins in separate function
2013-01-14 20:31:32 -07:00
fermionic
b920ce732c
Merge pull request #585 from fermionic/20130114-maintenance-mode
...
add maintenance mode
2013-01-14 18:18:34 -08:00
Zach Prezkuta
2a8e5032e0
run check_config() in a separate process
2013-01-14 16:58:32 -07:00
friendica
917acd6eb7
Merge https://github.com/friendica/friendica into pull
2013-01-14 15:51:31 -08:00
friendica
66a6970bb8
config cli will also work with Friendica without change - so bringing it over
2013-01-14 15:50:39 -08:00
Zach Prezkuta
28c9123ac8
module to show system down message
2013-01-14 16:48:01 -07:00
Zach Prezkuta
31c3bbf549
add maintenance mode
2013-01-14 16:35:41 -07:00
fermionic
aea7b84e92
Merge pull request #584 from fermionic/20130113-multiple-delete-comments
...
comments inherit pagedropping state of the top-level
2013-01-13 11:44:20 -08:00
Michael Vogel
452ff19d73
Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this.
2013-01-13 18:51:48 +01:00
Zach Prezkuta
98d83f5d0b
comments inherit pagedropping state of the top-level
2013-01-13 10:51:19 -07:00
Michael Vogel
5501dd0759
Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds.
2013-01-13 17:13:01 +01:00
Michael Vogel
b9afb38f4d
Some more function calls to ensure that the tags are deleted when an item is deleted
2013-01-13 15:11:06 +01:00
Michael Vogel
3dc615dd9d
Adding the tag creating function to the function when a photo is tagged
2013-01-13 15:05:24 +01:00
Michael Vogel
158bfda0ac
Changing the tag system to the "term" table.
2013-01-13 14:50:55 +01:00
e8952541af
ZH-CN: update to the strings
2013-01-13 12:55:13 +01:00
Michael Vogel
8cef0fa80d
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.
2013-01-13 09:37:15 +01:00
friendica
449b44fe4c
Merge https://github.com/friendica/friendica into pull
2013-01-12 15:09:35 -08:00
friendica
b5c0714bc4
fix live update on display page
2013-01-12 15:08:59 -08:00
friendica
8b643d4c88
Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
...
fixes and tweaks to Smarty processing
2013-01-12 12:28:14 -08:00
friendica
ceaedb41e4
Merge pull request #582 from fermionic/20130112-various-fixes
...
Various fixes
2013-01-12 12:24:51 -08:00
friendica
8d19dff6dc
Merge pull request #583 from fermionic/20130112-diaspora-photo-queue
...
Diaspora photo queue
2013-01-12 12:16:12 -08:00
Zach Prezkuta
7f19018cd4
fix leak
2013-01-12 06:56:45 -07:00
Zach Prezkuta
1507ec37a4
give post a chance to arrive before rejecting photos from Diaspora
2013-01-12 06:52:15 -07:00
Zach Prezkuta
74caf1a4a7
* 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
2013-01-12 06:31:32 -07:00
Zach Prezkuta
609c45e791
fixes and tweaks to Smarty processing
2013-01-12 05:58:54 -07:00
fermionic
d62483f526
Merge pull request #580 from fermionic/20130111-better-conversion-scripts
...
automatic, command-line conversion
2013-01-11 16:30:25 -08:00
Zach Prezkuta
c43ff35fe7
newline at end of header
2013-01-11 10:00:10 -07:00
Zach Prezkuta
1656c63a55
add warning message about automatically generated templates
2013-01-11 09:57:11 -07:00
