friendica
5205a374ee
block injection vector
2013-02-26 17:33:18 -08:00
fermionic
cf677a3003
Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports
...
run limit_body_size on imported emails, which don't go through consume_feed
2013-02-24 07:13:21 -08:00
Tobias Diekershoff
521ccc38c6
Merge pull request #625 from tobiasd/master
...
make sure conv_as->items is an array or don't proceed
2013-02-23 23:27:21 -08:00
Zach Prezkuta
fcab22b80f
run limit_body_size on imported emails, which don't go through consume_feed
2013-02-23 10:06:59 -07:00
Zach Prezkuta
4db50a3ecb
admin option to disable post content in email notifications for the site
2013-02-23 09:31:34 -07:00
Tobias Diekershoff
c2b49f2588
make sure conv_as->items is an array or don't proceed
2013-02-23 12:42:55 +01:00
friendica
280b72b9e6
Merge https://github.com/friendica/friendica into pull
2013-02-21 16:43:01 -08:00
friendica
615b060352
rev update
2013-02-21 16:42:34 -08:00
Michael Vogel
c90272e2ae
supressing warning when importing items. Speeding up community. Changed query for the search.
2013-02-20 21:47:36 +01:00
Michael Vogel
7e154d5e4c
plugin: orphaned hooks weren't deleted.
...
update: fixing update job for tags.
2013-02-17 18:05:30 +01:00
Michael Vogel
93143702ed
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
2013-02-17 12:35:40 +01:00
Michael Vogel
3e58060b30
API: beautify the output of repeated items
...
Vier: Birthday reminder looks better
2013-02-15 20:14:45 +01:00
Zach Prezkuta
399e8cd8e4
don't change to string in prune_deadguys()
2013-02-09 17:52:29 -07:00
friendica
6242f9a147
add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication.
2013-02-07 23:43:55 -08:00
fermionic
a0e18a0ff8
Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify
...
move mb_strlen call out of for loop definition
2013-02-06 21:38:15 -08:00
Zach Prezkuta
c886927a52
use mb_ereg_replace for xmlify and unxmlify
2013-02-06 22:30:27 -07:00
Zach Prezkuta
18f71c1050
parsing multi-byte strings with xmlify
2013-02-06 00:37:15 -07:00
Zach Prezkuta
774a78dbde
better unicode support in xmlify
2013-02-05 23:02:13 -07:00
friendica
2e6446371a
Merge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page
...
fix bug that wouldn't show posts to a user who was in an allowed group
2013-02-05 17:36:06 -08:00
friendica
70f02053e1
Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks
...
allow themes to use plugin hooks
2013-02-05 17:21:42 -08:00
Zach Prezkuta
6152cbd5ac
add support for more file attachment types
2013-02-04 22:15:16 -07:00
Zach Prezkuta
439974a5d5
allow themes to use plugin hooks
2013-02-04 20:53:53 -07:00
Zach Prezkuta
09a2786882
fix bug that wouldn't show posts to a user who was in an allowed group when individual contacts were also specified in the permissions
2013-02-04 20:27:30 -07:00
Zach Prezkuta
b6bc7daadf
move mb_strlen call out of for loop definition
2013-02-04 20:17:56 -07:00
Michael Vogel
c9307eb96a
OStatus conversation are now checked every 30 minutes for new answers.
2013-02-04 00:57:23 +01:00
zottel
c0af9b2938
Reset network when showing a contact's posts
...
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
2013-02-01 09:12:37 +01:00
Zach Prezkuta
22c962f1fa
remove deprecated call by reference
2013-01-29 18:44:42 -07:00
Michael Vogel
2350aa54eb
OStatus-Conversation auto completion works now.
...
Some performance issues added as well.
2013-01-30 01:31:27 +01:00
Zach Prezkuta
2635c59c83
don't block private posts to logged in users on the local hub
2013-01-27 22:42:36 -07:00
friendica
a5ac69c65e
Merge pull request #591 from fermionic/20130126-javascript-free-theme
...
Decaf mobile: an (almost) Javascript-free theme
2013-01-27 19:11:36 -08:00
friendica
38238972b5
really nitty permission tweaking
2013-01-27 18:10:26 -08:00
Michael Vogel
9967c9892d
only change parents when parents are changed.
2013-01-28 01:22:00 +01:00
Michael Vogel
e668fece10
ostatus auto completion now seems to work.
2013-01-28 01:16:51 +01:00
Michael Vogel
bc972e16ce
New function to complete threads from ostatus postings
2013-01-27 23:25:04 +01:00
Michael Vogel
2cb576d305
Bugfixing after adding timestamps
2013-01-27 13:57:44 +01:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
Michael Vogel
fdee002f73
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
Michael - piratica.eu
2c93067682
Performance: Adding several variables for performance measuring.
2013-01-26 16:46:43 +01:00
friendica
f542653230
suppress duplicate comment notifications
2013-01-23 17:46:46 -08:00
friendica
d074656f26
Merge https://github.com/friendica/friendica into pull
2013-01-23 17:08:21 -08:00
friendica
b3b0a9de24
die forcefully but gracefully on missing api templates
2013-01-23 17:07:55 -08:00
Tobias Diekershoff
1f36ebdb2b
add display_item hook back around l. 686 to the conversation
2013-01-22 08:11:13 +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
Zach Prezkuta
bf26af5ac6
insidious set_config bug
2013-01-18 23:38:49 -07:00
Michael Vogel
82c00660e0
Preloading of items in the cache when receiving them.
2013-01-17 23:20:40 +01:00
friendica
30f1fb2c4d
provide a date indication in reshared content
2013-01-15 14:58:50 -08:00
Zach Prezkuta
2a8e5032e0
run check_config() in a separate process
2013-01-14 16:58:32 -07: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
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
158bfda0ac
Changing the tag system to the "term" table.
2013-01-13 14:50:55 +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
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
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
Zach Prezkuta
5f1ef732e0
remove now-unnecessary line in text.php
2013-01-10 21:48:33 -07:00
Zach Prezkuta
bce29054b9
allow Smarty use on international templates
2013-01-10 21:46:48 -07:00
Michael Vogel
61c78711df
Preparations for a new tag structure. Tags are now stored in a dedicated table.
2013-01-11 01:20:16 +01:00
Michael Vogel
82820d8e95
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.
2013-01-09 20:54:18 +01:00
friendica
4ab363ed71
bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)
2013-01-07 20:14:00 -08:00
friendica
07ba4da634
email header encoding everywhere
2013-01-04 15:47:29 -08:00
friendica
a5755b59a8
preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570
2013-01-04 15:21:05 -08:00
friendica
88cc414355
Merge pull request #570 from annando/master
...
Vier, caches and "share" via API
2013-01-04 15:13:09 -08:00
Thomas Willingham
a8ea3d6e48
We haven't Got Zot
2013-01-03 20:18:43 +00:00
friendica
e394ccd0a8
If we're going to encode the email headers, we probably should use the encoded version rather than the original
2013-01-03 03:47:08 -08:00
Michael Vogel
e50c0efcdf
Merge remote-tracking branch 'upstream/master'
2012-12-30 21:32:18 +01:00
Michael Vogel
ad287914c7
Support of "share" through the API.
2012-12-30 21:30:39 +01:00
friendica
215a7f139c
make smarty error reporting a bit less chatty
2012-12-30 00:29:07 -08:00
friendica
4b2de6fdf2
if snautofollow - make all SN contacts writable
2012-12-29 02:51:15 -08:00
friendica
f962ecdd64
Merge https://github.com/friendica/friendica into pull
2012-12-29 02:36:19 -08:00
friendica
05996457f9
receiving post from archived Diaspora contacts
2012-12-29 02:35:41 -08:00
Zach Prezkuta
e684324032
use explicit include paths
2012-12-28 14:51:50 -07:00
Michael Vogel
6f6b1f95c8
vier: With IE there are no borders around images anymore
...
bbcode: Multiple new lines are now reduced
2012-12-28 11:31:30 +01:00
Fabrixxm
b620b6e608
api: add 'allow_api' to user authenticated via oauth
2012-12-27 10:20:51 -05:00
fermionic
d3c54438df
Merge pull request #563 from fermionic/20121225-smarty-includes-like-friendicas
...
revert unnecessary variable name changes
2012-12-26 09:44:27 -08:00
Zach Prezkuta
263fe0f6bc
revert unnecessary variable name changes
2012-12-26 10:42:01 -07:00
fermionic
7e9730089f
Merge pull request #561 from fermionic/20121225-smarty-includes-like-friendicas
...
20121225 smarty includes like friendicas
2012-12-25 11:08:06 -08:00
Zach Prezkuta
e736abd372
small fixes; update smarty3 templates
2012-12-25 12:05:46 -07:00
Zach Prezkuta
11c06e21b7
simplify by making Smarty include directives behave like Friendica native ones
2012-12-25 11:55:57 -07:00
Michael Vogel
5bc6896671
The caches are now cleared only once an hour.
2012-12-25 12:52:30 +01:00
Zach Prezkuta
f0f8d0f687
delete cookie on browser close after logout
2012-12-24 12:52:49 -07:00
fermionic
a0d7f7a6d3
Merge pull request #550 from fermionic/20121222-use-smarty-template-engine
...
only use Smarty if the view/smarty3/ directory is writable
2012-12-23 05:19:02 -08:00
Zach Prezkuta
53a4cf5339
only use Smarty if the view/smarty3/ directory is writable; location bug fix
2012-12-23 06:16:35 -07:00
friendica
a29842e301
Merge https://github.com/annando/friendica into annando
...
Conflicts:
view/admin_site.tpl
2012-12-22 23:02:21 -08:00
Zach Prezkuta
96ed0a7791
Implement Smarty3
2012-12-22 12:57:29 -07:00
Michael Vogel
b0759e9a9f
Some more system settings are now reachable via front-end
...
Bugfixing in the mail import when a reply header isn't set correctly
2012-12-22 16:16:01 +01:00
Michael Vogel
99ca867869
The performance settings and other systems settings (lock file path, temp path) can now be set via the front end.
2012-12-21 18:23:55 +01:00
Michael Vogel
7c7d3fe5de
"share" - now the attribut value for the "author" is escaped
2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3
New option to enable and disable the "share" element
...
Changes to "vier" to use more "font awesome" icons
2012-12-21 00:08:58 +01:00
Michael Vogel
a8aa992102
Vier: Design issues with preview fixed
2012-12-20 04:19:02 +01:00
Michael Vogel
0a29927e6d
Mail: real threading now works with outgoing mails.
2012-12-19 16:31:06 +01:00
Michael Vogel
a86baa372a
Mailimport is now realized like a wall-to-wall-post
2012-12-19 15:58:38 +01:00
Michael Vogel
c22f65bafa
repeated items from ostatus and diaspora are now using the share-element.
...
Some design changes to repeated items in "vier".
2012-12-19 12:18:52 +01:00
Michael Vogel
9ab34f8857
mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header.
2012-12-18 00:47:55 +01:00
Michael Vogel
fc816feb6d
mailimport: Bug that prevented mails to be imported
2012-12-17 21:39:52 +01:00
Michael Vogel
4164257cb2
vier: The alt-pager and the birthday- and eventreminder is optically improved
2012-12-17 21:12:11 +01:00