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
Michael Vogel
a6b1275f16
Merge remote-tracking branch 'upstream/master'
2012-12-17 10:32:53 +01:00
Michael Vogel
9c0de28622
bbcode: New element "share" for shared content
...
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
2012-12-17 03:01:40 +01:00
friendica
0f1592547e
Merge https://github.com/friendica/friendica into pull
2012-12-16 17:59:15 -08:00
friendica
3f63a69d7a
divide by zero on incorrectly specified oembed thumbnail size
2012-12-16 17:58:12 -08:00
Michael Vogel
d253d59668
vier: Added Delegations and optical changes.
2012-12-15 14:39:37 +01:00
Michael Vogel
46c5a97a20
New caching system for photos
2012-12-14 22:47:30 +01:00
Fabrixxm
71751ecb8c
template_processor: add filter support to variables
2012-12-14 10:10:33 -05:00
friendica
6b36863dd8
prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists -
...
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
2012-12-13 21:02:14 -08:00
friendica
376bf517a4
bug #516 - set writable on first poll
2012-12-06 13:59:20 -08:00
friendica
8b5288d0f7
Merge pull request #540 from Leberwurscht/master
...
Cross site request forgery hole
2012-12-03 13:40:29 -08:00
tobiasd
23c873fc51
Merge pull request #542 from annando/master
...
Some minor changes to "vier"
2012-12-02 23:49:06 -08:00
Michael Vogel
5635fe250c
Merge remote-tracking branch 'upstream/master'
2012-12-03 08:30:49 +01:00
Leberwurscht
945afec656
fix CSRF hole in API
2012-12-01 01:26:54 +01:00
friendica
b130c892b2
features categories were un-translatable
2012-11-28 19:25:09 -08:00
friendica
32868dab79
catch stragglers in "chunked" delivery mode
2012-11-27 15:17:41 -08:00
friendica
5d904a9fa8
improve performance of photo upload page
2012-11-25 19:34:54 -08:00
friendica
226d1ba7c1
Merge pull request #537 from fermionic/20121121-features
...
Port Features from Red
2012-11-22 20:54:16 -08:00
Zach Prezkuta
a536a4e657
local stuff leaked
2012-11-22 09:21:21 -07:00
Zach Prezkuta
04f5506318
forgot some slightly important files
2012-11-22 09:20:03 -07:00
Zach Prezkuta
94204d9160
implement features
2012-11-22 09:14:22 -07:00
Michael Vogel
e36c30d285
Vier: Margin problems with code fixed.
2012-11-22 15:06:15 +01:00
friendica
9835efc9e4
fix jenkins tests
2012-11-22 05:06:15 -08:00
friendica
868bdc9b6a
php warning
2012-11-22 03:19:05 -08:00
friendica
0840c8365a
always check for valid dfrn_id before auto_redir
2012-11-21 15:56:00 -08:00
friendica
4d289574ca
ensure that auto_redir does not loop
2012-11-21 15:41:14 -08:00
friendica
f1c579e74a
Merge https://github.com/friendica/friendica into pull
2012-11-18 23:50:37 -08:00
friendica
70d0ed9402
log directory updates
2012-11-18 22:53:01 -08:00
Michael Vogel
5dbf89be88
Making the new reshare method optional
2012-11-17 16:27:49 +01:00
Michael Vogel
f17377e6de
New cache system with subdirectories
2012-11-17 00:50:39 +01:00
Michael Vogel
e67062d9cf
Merge remote-tracking branch 'upstream/master'
2012-11-15 21:52:35 +01:00
friendica
ab0dc3131a
fix wallmessage
2012-11-14 13:59:31 -08:00
friendica
3dc4c52022
Merge pull request #533 from fabrixxm/moveme
...
Fix issue 508
2012-11-13 14:06:20 -08:00
Fabrixxm
374683503a
uimport: check check to ensure the username isn't already taken before import (issue 508)
2012-11-13 04:52:32 -05:00
friendica
009744af50
allow posted ACLs to be comma-delimited string besides the default array
2012-11-11 13:56:21 -08:00
friendica
6e0dd29c1b
include some notes on grabbing the tumblr avatar
2012-11-11 00:44:30 -08:00
friendica
de5a21bec4
improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago.
2012-11-11 00:28:21 -08:00
Michael Vogel
b875191237
Diaspora: Avatars of repeated items weren't found
...
Vier: Complete redesign of the navigation header
2012-11-10 23:19:32 +01:00
Michael Vogel
71e43e68d4
Merge remote-tracking branch 'upstream/master'
2012-11-09 23:40:17 +01:00
Zach Prezkuta
ac164cfca8
refresh login time every 12 hours for 'Remember me'
2012-11-08 17:00:37 -07:00
Michael Vogel
5d2d306d9f
Make reshared Diaspora postings look lile wall-to-wall postings (preparation for real forwards in friendica)
2012-11-08 21:45:53 +01:00
Michael Vogel
4196b6a96c
Merge remote-tracking branch 'upstream/master'
2012-11-08 21:44:17 +01:00
Zach Prezkuta
e116712bf5
add ability to remember logged in user after browser closes
2012-11-07 18:59:30 -07:00
Zach Prezkuta
999c3439e6
fix mobile photo uploads; better theme control; frost improvements
2012-11-06 08:43:19 -07:00
friendica
776552226b
Merge https://github.com/friendica/friendica into pull
2012-11-06 01:10:36 -08:00
friendica
fd4d35b16c
set writable for ostatus followers
2012-11-06 01:10:12 -08:00
zzottel
eb3408b574
Merge pull request #526 from zzottel/master
...
Forgot to commit the changes(regarding fermionic's comments) in notifier.php
2012-11-05 23:18:48 -08:00
zottel
b7e121ccf7
Forgot to commit the changes (regarding fermionic's comments) in notifier.php
2012-11-06 08:16:08 +01:00
Fabrixxm
cef5afc53d
moveme: remove debug comment
2012-11-05 04:15:09 -05:00
Fabrixxm
5b4944fe8e
Merge remote-tracking branch 'remotes/friendica/master' into moveme
2012-11-05 09:37:58 +01:00
Fabrixxm
385ee5a862
pass $argv & $argc as reference to *_run() functions.
2012-11-05 09:28:54 +01:00
Fabrixxm
aa20042bec
moveme: fix contact photos
2012-11-05 09:18:55 +01:00
root
fe3f1af92f
Merge remote-tracking branch 'upstream/master'
2012-11-04 23:31:05 +01:00
Michael
6afa5d1c48
In the API you now can update not only the body but also the title. In html2plain the function for valid urls was improved.
2012-11-04 23:18:52 +01:00
zottel
dd1e735efb
Worked in fermionic's comments (not count($r)).
2012-11-04 11:07:11 +01:00
Michael
2b6498b2a2
Merge remote-tracking branch 'upstream/master'
2012-11-03 22:27:34 +01:00
zottel
2871fd4793
Depublish public posts when archiving a contact
2012-11-02 23:54:03 +01:00
zottel
7de5c7ebe1
Changes to make contacts delete all content from the user when a user is deleted.
...
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.
Please check carefully. I tested locally on my server, but not with other
servers.
2012-11-02 21:43:47 +01:00
Zach Prezkuta
c9248b66db
display live update; don't collapse comments on live update
2012-11-01 18:31:50 -06:00
Zach Prezkuta
6effdd570c
add a confirm dialog and a busy rotator for delete selected
2012-11-01 17:42:40 -06:00
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
Zach Prezkuta
d98974572b
fix theme control of allowing threading
2012-11-01 10:33:01 -06:00
Zach Prezkuta
43de9cf904
don't try to auto redir if I'm a blocked or pending contact
2012-11-01 10:32:33 -06:00
Fabrixxm
1a3a5ee8d9
moveme: first successful relocated user
2012-10-31 17:13:45 +01:00
friendica
a41e78a06d
Merge pull request #516 from fermionic/20121029-auto-redir-fix
...
make sure that the contact is local for auto redir
2012-10-29 21:00:28 -07:00
friendica
d3682f5d6a
Merge pull request #517 from fermionic/20121029-wall-live-commenting
...
add live div to wall page
2012-10-29 20:58:32 -07:00
Zach Prezkuta
200d2030d5
don't combine msg and meta arrays unless they're the same size
2012-10-29 12:47:51 -06:00
Zach Prezkuta
4fd339b216
add live div to wall page
2012-10-29 12:43:52 -06:00
Zach Prezkuta
4990f64927
make sure that the contact is local for auto redir
2012-10-29 12:03:48 -06:00
Fabrixxm
dbc6cbe024
moveme: send and receive DFRN "relocate" message (WIP)
2012-10-29 17:50:55 +01:00
Fabrixxm
c51e057fe6
Merge remote branch 'friendica/master' into moveme
2012-10-29 05:57:58 -04:00
friendica
02251f23df
undefined fn: init_groups_visitor in mod_profile, rev update
2012-10-21 14:41:10 -07:00
Michael Vogel
28b085569a
Merge remote branch 'upstream/master'
2012-10-19 07:12:15 +02:00
friendica
2347a4326c
get rid of 'Friendika'
2012-10-18 21:51:45 -07:00
friendica
f6f3042d00
imagick exception
2012-10-17 15:22:29 -07:00
Fabrixxm
65d235017c
move account. first step.
...
export basic account data as json
import basic account data in db (dbs must be at same schema version)
2012-10-17 11:13:01 -04:00
friendica
80513e4332
Trying this fix for endless redirection
2012-10-15 18:51:22 -07:00
friendica
fd6a21f522
oops - missingfile from last checking, the important one
2012-10-15 16:33:00 -07:00
fermionic
ca21f1bbc8
Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts
...
for profile and photos, detect contacts from local hub and auto-redir
2012-10-11 17:24:11 -07:00
fermionic
2f3d118e77
Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
...
allow themes to decide where live updates appear
2012-10-10 17:34:28 -07:00
Zach Prezkuta
b9818185db
for profile and photos, detect contacts from local hub and auto-redir
2012-10-09 09:50:24 -06:00
Zach Prezkuta
0ea89852d2
allow themes to decide where live updates appear
2012-10-09 09:41:33 -06:00
Zach Prezkuta
c3cf459b27
use getWidth and getHeight, which are agnostic to Imagick being enabled
2012-10-09 09:35:32 -06:00
friendica
112fafcc81
consistent handling of scaled images when using imagick
2012-09-30 03:25:20 -07:00
friendica
e0dbd2e8e4
Merge pull request #494 from fermionic/diaspora-contact-lookup-fails
...
look for DFRN contacts as well
2012-09-30 01:58:37 -07:00
friendica
e60c729b51
Merge pull request #495 from fermionic/email-optimization
...
send less messages to server; remove delete option
2012-09-30 01:58:07 -07:00
friendica
35905ebf1c
Merge pull request #496 from fermionic/deleted-group-stays-in-default-permissions
...
remove groups from default permissions when removed; bug in group_add_member
2012-09-30 01:57:52 -07:00
Zach Prezkuta
34081010ff
allow contact if in allowed group, even if not in non-empty allowed contacts
2012-09-29 17:54:37 -06:00
Zach Prezkuta
4af4e9aa9f
remove groups from default permissions when removed; bug in group_add_member
2012-09-29 17:53:06 -06:00
Zach Prezkuta
f4f3c8375f
send less messages to server; remove delete option
2012-09-29 17:50:34 -06:00
Zach Prezkuta
59ace4f4d7
look for DFRN contacts as well
2012-09-29 17:48:56 -06:00
friendica
8416cff2a5
slight adjustment to Photo scaling - also discovered imagick resize may need some additional work
2012-09-29 05:46:01 -07:00
friendica
0693afd6b7
only constrain horizontal image dimension for scaling very tall photos
2012-09-29 05:20:29 -07:00
Michael Vogel
ea6ced8359
Merge remote branch 'upstream/master'
2012-09-29 08:35:17 +02:00
friendica
cef5169567
subscribe-to/follow threads
2012-09-27 19:53:55 -07:00
friendica
25773b41cb
add "tagged" hook (bots and such)
2012-09-26 18:24:19 -07:00
friendica
e433f20cd8
sort out the 'delete selected' mess
2012-09-25 19:10:46 -07:00
friendica
245d9f0aca
one template to rule them all
2012-09-25 01:31:48 -07:00
friendica
8184de9c78
remove THISPLUGIN definition - not used and doesn't work
2012-09-24 01:30:18 -07:00
friendica
054f8edb59
zeros - theming for new categories/folder display
2012-09-23 19:22:48 -07:00
friendica
c3b4f9f0d3
support for bringing back cats/folders
2012-09-23 17:16:37 -07:00
Fabrixxm
dd25c7db7e
more $item data
...
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php
2012-09-20 09:46:49 +02:00
Fabrixxm
40f2ec189e
Merge remote branch 'friendica/master' into blog-like
2012-09-20 02:48:54 -04:00
Michael Vogel
4c389eb73b
Merge remote branch 'upstream/master'
2012-09-20 08:32:33 +02:00
Zach Prezkuta
da7c5b19b1
allow hidden comments phrase to be accessed separately as number and text
2012-09-19 21:31:26 -06:00
Zach Prezkuta
1aa111387a
-- Fix Diaspora profile update avatar bugs
...
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
2012-09-19 20:35:39 -06:00
Fabrixxm
b400ddd22d
conversation: new 'categories' and 'folder' elements to $item
...
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array
2012-09-19 11:38:32 -04:00
friendica
66081201bc
allow "subscribe to thread" activities to exist without displaying them.
2012-09-18 20:12:55 -07:00
friendica
2abbd1dc19
permissions selector showing up for guests, testbubble and smoothly
2012-09-15 20:21:17 -07:00
