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
friendica
669d2b890e
rev update - add cancel markup to editor
2012-09-15 15:23:15 -07:00
friendica
32d4a359f1
reverse the default newuser privacy setting to public. Sites can over-ride.
2012-09-13 19:11:07 -07:00
friendica
d19a3b8324
provide separate hashtag and mentions for themes in addition to composite tags
2012-09-13 16:59:25 -07:00
friendica
f4e3f335ef
don't allow followers to get a post through unless it's a tag deliver
2012-09-12 18:53:20 -07:00
friendica
3d6c49d5b3
Merge https://github.com/friendica/friendica into pull
2012-09-12 17:20:52 -07:00
friendica
db09724aec
use local photo for tag notifications if available
2012-09-12 17:19:26 -07:00
Domovoy
67563d5c82
Fallback to gd if Imagick can't load the data
2012-09-12 11:55:09 +02:00
Michael Vogel
5cfb068c25
Merge remote branch 'upstream/master'
2012-09-10 23:28:07 +02:00
Domovoy
16eec24a21
Tabs trouble? What happened? I sure aven't changed anything to my editor...
2012-09-10 10:36:30 +02:00
Domovoy
1b82df60db
Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd
2012-09-10 09:50:30 +02:00
Domovoy
bb68461c6d
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
include/conversation.php
2012-09-10 09:19:08 +02:00
friendica
5c0f0df59a
provide local_block - block_public as far as content but can connect with the grid.
2012-09-06 20:17:50 -07:00
Thomas Willingham
d0994fc882
Merge branch 'master' of https://github.com/friendica/friendica
2012-09-07 00:44:01 +01:00
Thomas Willingham
5f970aea72
Typo in notifier.
2012-09-07 00:43:05 +01:00
fermionic
9bf8efc45f
Merge pull request #459 from fermionic/individual-choice-of-mobile-theme
...
Individual choice of mobile theme
2012-09-06 16:35:04 -07:00
Zach Prezkuta
a089a89478
small twitter improvements
2012-09-06 17:31:05 -06:00
Zach Prezkuta
77529ccdf1
allow individual choice of mobile themes
2012-09-06 17:24:34 -06:00
friendica
1478229abc
allow comments on other folks wall-to-wall postings
2012-09-05 18:24:06 -07:00
friendica
3968dc932f
update writable for dfrn contacts when using local delivery
2012-09-05 16:26:11 -07:00
friendica
9e5fa5b9a9
ignore exif orientation if we can't parse the particular flavour of exif
2012-09-05 04:02:30 -07:00
friendica
411b6a71b4
Merge https://github.com/friendica/friendica into pull
2012-09-04 22:53:32 -07:00
friendica
4cd8233f61
remote_user can now support multiple contacts being logged in at once
2012-09-04 22:50:28 -07:00
Zach Prezkuta
79012bf888
conversation needs preview parameter
2012-09-04 18:47:49 -06:00
Michael Vogel
59d378913d
Merge remote branch 'upstream/master'
2012-09-04 07:22:59 +02:00
friendica
cdf648c0b4
attachments from non-friendica contacts shouldn't go through redir - it won't work
2012-09-03 21:31:35 -07:00
Michael Vogel
f6818ab243
Merge remote branch 'upstream/master'
2012-09-02 17:50:25 +02:00
Michael Vogel
3c24a7ed3e
items: added some logging infos
2012-09-02 17:49:06 +02:00
friendica
39c7b34276
rev update
2012-09-02 01:47:04 -07:00
friendica
2ace7d6646
Merge pull request #451 from fabrixxm/master
...
fixes and tweaks
2012-08-31 01:26:03 -07:00
Domovoy
ef52ff6b01
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-30 07:47:21 +02:00
Fabrixxm
f433158bed
config: fix get_config and get_pconfig search for serialized array
...
works also if the serialized string contains newlines
2012-08-29 04:19:15 -04:00
Zach Prezkuta
f7a1999c15
manually fix escaped underscores in links
2012-08-28 20:12:41 -06:00
fermionic
597e96e156
Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags
...
regular expressions were grabbing too much
2012-08-28 19:03:04 -07:00
fermionic
8c064069d9
Merge pull request #443 from fermionic/new-users-privacy-settings
...
automatically make posts private for new users
2012-08-28 19:02:51 -07:00
Fabrixxm
9ecb984285
Merge remote branch 'friendica/master' into bid-prov
2012-08-28 10:38:40 -04:00
Zach Prezkuta
72712175b5
regular expressions were grabbing too much
2012-08-26 14:56:34 -06:00
Zach Prezkuta
193cc2c537
try to get rid of scrollbars in Frost
2012-08-25 22:42:12 -06:00
Zach Prezkuta
f062ccbb66
add documentation; add to admin panel; some tweaks and interface stuff
2012-08-25 15:03:16 -06:00
Zach Prezkuta
bd59f3d152
probably shouldn't require exact match for non-string
2012-08-24 21:46:42 -06:00
Zach Prezkuta
7c5f5f3113
automatically make posts private for new users
2012-08-24 21:28:28 -06:00
Domovoy
9390eda5e6
Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum)
2012-08-24 05:11:39 +02:00
Domovoy
5cd1dde59b
Logic error
2012-08-24 05:04:35 +02:00
Domovoy
72f3d628e8
Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items
2012-08-24 04:58:11 +02:00
Domovoy
c9cfc52293
method, not property
2012-08-24 04:57:32 +02:00
Domovoy
71d9c95faf
Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items
2012-08-24 04:47:29 +02:00
Domovoy
e3ee997cd3
Fix copy/paste stupidity
2012-08-24 04:45:10 +02:00
Domovoy
8a25c7876c
Better wall to wall detection (fallback on checking if we have a @ tag)
2012-08-24 04:36:03 +02:00
Domovoy
f1bc2afbfe
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-23 10:25:22 +02:00
friendica
386b6d081b
moods
2012-08-22 21:36:55 -07:00
friendica
ff0e0782a5
restore old comment behaviour when threading turned off
2012-08-21 19:41:50 -07:00
friendica
bcec1bddc0
put the real post time into the post
2012-08-19 14:39:43 -07:00
Domovoy
1406480258
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-19 14:14:33 +02:00
friendica
6bc48b58d8
algorithm for crypt tag
2012-08-19 00:35:39 -07:00
Domovoy
51802b0ae8
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-18 17:23:46 +02:00
Domovoy
17f9fcaec9
Checks done on topmost parent in local_delivery, closes #10
2012-08-18 17:17:33 +02:00
friendica
d96b9cda43
wall-to-wall posts not identified correctly after thread mod
2012-08-17 22:06:13 -07:00
Domovoy
429870015f
Comments on friends are back (stupid typo)
2012-08-17 16:20:28 +02:00
Domovoy
16260e9fbb
Merge branch 'threaded_items' of github.com:CyberDomovoy/friendica into threaded_items
2012-08-17 15:49:23 +02:00
Domovoy
1581e02f8f
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-17 09:46:43 +02:00
Michael Vogel
d40f25ae08
bbcode: Function for cleaning CSS commands (not yet in function)
...
items.php: The detection if a rss/atom-title is identically to the body is improved.
2012-08-17 07:59:21 +02:00
friendica
68d7a3ae01
put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do.
2012-08-15 17:14:29 -07:00
friendica
e802c81ec1
fix single quotes
2012-08-15 05:09:44 -07:00
friendica
b8df47e97c
bbcode quote display
2012-08-15 04:52:18 -07:00
friendica
bb188cbdf2
extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues.
2012-08-15 02:59:17 -07:00
friendica
4654ebd43b
correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare
2012-08-15 00:02:15 -07:00
friendica
aaadabf7d2
partial fix for D* public key format change
2012-08-14 02:20:48 -07:00
Zach Prezkuta
7d8aee05ef
update items seen in DB when using API
2012-08-12 20:29:37 -06:00
friendica
bfec28f1fe
threading messed up a bit of cross-site federation code
2012-08-12 18:42:43 -07:00
Domovoy
82d779a33b
Conversation and Item now handles (dis)like as they should
2012-08-12 17:46:02 +02:00
Domovoy
04f14d96c6
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-12 17:34:23 +02:00
Domovoy
71f11a9a32
Item: new method get_comment_box
2012-08-12 16:02:47 +02:00
friendica
e81f15b28d
crypt bbcode tag
2012-08-12 04:29:26 -07:00
Zach Prezkuta
5e09fc31f5
Threading updates
...
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
2012-08-11 14:36:58 -06:00
Domovoy
d817117f6e
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
include/conversation.php
2012-08-11 16:42:47 +02:00
friendica
d4b6188356
getting comment counts correct in a threaded world
2012-08-11 01:26:10 -07:00
friendica
95bf9324b4
fix child count
2012-08-10 23:42:45 -07:00
friendica
20be1778db
bring likes back - comment ordering is still a bit funky
2012-08-10 16:36:44 -07:00
Domovoy
75d355a2aa
Rendering is now done by Item objects
2012-08-10 19:57:39 +02:00
Domovoy
6ef86e1fff
New objects: Conversation and Item
2012-08-10 17:46:39 +02:00
Zach Prezkuta
009ebc732a
move tag transformation to bb2diaspora; start taking out unnecessary signature stuff
2012-08-10 08:13:17 -06:00
Fabrixxm
fc07f50fd8
conversation: add 'thread_level' to $item array
2012-08-10 05:42:36 -04:00
Fabrixxm
dbbf5b86a2
template processor: trim strings in {{ if str!=str }}, add 'debug' tag:
...
{{ debug $var [$var1 [$var2 [...]]] }}{{ enddebug }}
is replaced by
<pre>var_export($var1)\nvar_export($var2)\n....</pre>
2012-08-10 04:55:51 -04:00
friendica
4894619d7b
bring back "delete selected items" - but need to pass pagedropping to each item
2012-08-09 23:01:37 -07:00
Domovoy
4cc6bf660c
The number of comments shown when collapsed is the total of all the descendant items.
2012-08-07 09:53:53 +02:00
Domovoy
f3b1391501
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-07 09:40:21 +02:00
friendica
10b0ce5861
Merge https://github.com/friendica/friendica into pull
2012-08-06 19:52:49 -07:00
friendica
558fbcc69e
rev update + don't tag anything in [] brackets
2012-08-06 19:50:57 -07:00
Zach Prezkuta
d8a13d6e8d
allow themes to change the size of embedded videos
2012-08-06 09:59:57 -06:00
friendica
5d7f9d3b4b
rev update
2012-08-05 21:43:20 -07:00
Domovoy
5b374c4050
Diaspora doesn't support threaded comments (forgot some)
2012-08-05 19:30:21 +02:00
Domovoy
707dd216ce
Diaspora doesn't support threaded comments
2012-08-05 19:27:54 +02:00
Domovoy
dac88fce56
Remove database update, use fallback solution instead.
2012-08-05 15:08:31 +02:00
Domovoy
e247915f48
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
include/conversation.php
2012-08-05 13:43:53 +02:00
Domovoy
5d1eb37b9b
Remote items should be threaded now
2012-08-05 13:30:51 +02:00
friendica
9732f1fccf
expire issue
2012-08-04 23:29:52 -07:00
friendica
e27395b3d7
Merge pull request #423 from fermionic/frost-updates
...
Various updates
2012-08-04 17:02:57 -07:00
Zach Prezkuta
ba66e17d1d
ImageMagick rotates CW while imagerotate() rotates CCW
2012-08-04 17:30:25 -06:00
Domovoy
786e9064f2
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-04 23:33:06 +02:00
Zach Prezkuta
63628910b2
-- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter)
...
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
2012-08-04 14:02:39 -06:00
friendica
0c67649c08
put back notags
2012-08-03 18:36:45 -07:00
friendica
621e737826
fix angle char storage and transmission, rev update
2012-08-03 18:33:11 -07:00
Domovoy
8742beb772
Flatten children when threads are disabled
2012-08-03 22:28:21 +02:00
Domovoy
ea7db7b7a8
Threaded items in every page concerned. Some code cleanup.
2012-08-03 21:55:17 +02:00
Domovoy
66848b0471
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
update.php
2012-08-03 18:57:37 +02:00
Michael Vogel
2aa67d67f5
Changed markdown to enable diaspora postings with images that contain links
2012-08-02 01:46:28 +02:00
Michael Vogel
04c31d194f
Merge remote branch 'upstream/master'
...
Conflicts:
update.php
2012-08-02 00:21:14 +02:00
Michael Vogel
bed99674d2
bbcode: two new bbcode elements (style, class) for CSS
2012-08-02 00:13:37 +02:00
friendica
372ad112c9
tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
2012-08-01 01:36:39 -07:00
Domovoy
07f87848b4
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-07-30 13:36:33 +02:00
Zach Prezkuta
067865db9e
fix filer bug; some interface tweaks
2012-07-29 14:49:12 -06:00
Domovoy
7b2ca538c8
Fallback to the old behavior for unhandled conversations mode.
2012-07-29 21:11:19 +02:00
Domovoy
56f0ee4915
Threaded items on profile page
2012-07-29 20:41:11 +02:00
Domovoy
3b330510ea
Fixed misbehaviour in collapsing
2012-07-29 20:09:51 +02:00
Domovoy
2fc0fcdc18
Unlimited level threading is now a site option.
2012-07-29 19:53:04 +02:00
Domovoy
25015d3ab9
Update now handles threaded items.
2012-07-29 18:39:38 +02:00
Domovoy
8ea3087342
Collapsing is back for threaded comments.
...
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
2012-07-29 17:13:21 +02:00
Domovoy
10eb873f7c
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-07-29 10:03:17 +02:00
Zach Prezkuta
1f09e7ad23
Modify Javascript to improve page loading times
...
1. Add template category 'end' that places content right before final </body> tag
2. Move most Javascript from tpl files into one cacheable file, theme.js
3. Load scripts at end of the HTML document instead of in the header
4. Minify several Javascript files
Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
Domovoy
d558d25540
CommentBox is now hidden by default, this can be toggled with a fake link
2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db
Threaded comments are starting to work.
...
For now, only on normal view, and not during update
2012-07-27 22:08:57 +02:00
Fabrixxm
672f9fd87f
include/plugin: define THISPLUGIN as "addon/$pluginname/$pluginname.php"
...
to make life a litte bit easy to lazy plugin devs like me
2012-07-27 09:02:28 -04:00
Rainulf Pineda
1573c10631
Fixed syntax error in usage of anonymous function.
2012-07-25 21:38:28 -04:00
Michael Vogel
fc27edb6d7
network: Caching of images
2012-07-26 00:23:25 +02:00
Michael Vogel
6456c2484e
scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
2012-07-25 23:40:23 +02:00
Domovoy
50d1bdd902
Removed useless function
2012-07-24 17:32:13 +02:00
Domovoy
c8f484e4a5
Rplace spaces with undercores in tags
2012-07-24 17:22:56 +02:00
friendica
aa5e60248a
Merge pull request #405 from fermionic/support-for-mobile-themes
...
changes to support a mobile theme
2012-07-23 20:18:23 -07:00
friendica
982625db9c
update contact photos and names in local delivery - not just polled feeds
2012-07-23 20:00:00 -07:00
Zach Prezkuta
5cb979f5e4
changes to support a mobile theme
2012-07-23 20:37:00 -06:00
Domovoy
35f1081bfe
Removed the debug statement
2012-07-23 20:16:06 +02:00
Domovoy
d6c600ce11
Hooks now have a 'priority' value, default to 0.
...
The hooks are retrieved from the database by descending priority.
As a result they are run in the same order.
2012-07-23 15:35:31 +02:00
Domovoy
ba76af3488
Forgot a ;
2012-07-22 17:50:58 +02:00
Domovoy
36f600aaf2
Moved compression setup in constructor for Imagick
2012-07-22 17:27:09 +02:00
Domovoy
a3df0d9817
get_FormatsMap doesn't need to be static
2012-07-22 17:09:18 +02:00
Domovoy
62cd4dcb77
Set the type to what it will be saved to in the constructor
2012-07-22 17:07:13 +02:00
Domovoy
7a1f15c8da
Always coalesce, if it is not a multi-frame image it won't hurt anyway
2012-07-22 16:27:22 +02:00
Domovoy
c0d3d50fb5
Don't forget to clean frames before saving
2012-07-22 16:22:06 +02:00
Domovoy
ab484ebc76
getExt should not use Imagick format, mapping ext and mime type is more accurate.
2012-07-22 16:19:35 +02:00
Domovoy
83075c2f27
Set the Imagick image format in the constructor, so we can uset [get|set](image)XXX methods as intended
2012-07-22 16:12:47 +02:00
Domovoy
689e3028bf
Use getImageFormat to know the image format in the constructor.
...
Since we don't load the image with Imagick constructor, we need to use the [get|set]imageXXX methods.
We should be able to handle the image as if it was loaded from Imagick constructor, so that we don't get lost between the image and its frames.
Also added a debug log so that we get some info on unhandled mime types.
2012-07-22 15:24:41 +02:00
Domovoy
0acb983be4
guess_image_type now uses Imagick::getImageMimeType()
2012-07-22 15:17:40 +02:00
Domovoy
5d0bd98d2a
Photo::getType() now uses the accurate Imagick::getImageMimeType()
2012-07-22 14:50:19 +02:00
Domovoy
f723f756fd
Photo::scaleImageSquare was giving an inexistent variable to scaleImage.
2012-07-22 14:22:47 +02:00
Domovoy
6c2cd91184
gd is back in the game as a fallback: not everybody can have Imagick.
2012-07-22 13:43:46 +02:00
Domovoy
fb2f4b6b35
Photo now uses Imagick instead of gd.
2012-07-21 17:17:19 +02:00
friendica
43d986cab2
one for the ladies who get poked by undesirables.
2012-07-20 00:47:30 -07:00
friendica
700569c7d6
this is the one I'll probably use the most
2012-07-19 22:40:45 -07:00
friendica
9c72b45f36
and the main photo menu
2012-07-19 21:27:22 -07:00
friendica
64bd634582
add poke to contact photo menu
2012-07-19 21:03:31 -07:00
friendica
a54278649f
poke notifications
2012-07-19 20:13:40 -07:00
friendica
d442bbc482
have fun...
2012-07-19 18:17:16 -07:00
Michael Vogel
c8f99a8a66
Merge remote branch 'upstream/master'
2012-07-18 21:03:57 +02:00
friendica
749ae9b297
filter the protocol specifier in bbcode links.
2012-07-17 18:33:04 -07:00
friendica
f440d76200
recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396
2012-07-15 21:00:11 -07:00
friendica
02d88e7cbe
name mixup in wall-to-wall hovertips
2012-07-15 20:56:09 -07:00
friendica
210fe188b2
missing param
2012-07-15 17:07:53 -07:00
Michael Vogel
7aa10d1935
Merge remote branch 'upstream/master'
2012-07-15 17:26:00 +02:00
Michael Vogel
335c15ede5
Hopefully the final fix for image links in bb2diaspora
2012-07-15 13:40:01 +02:00
Michael Vogel
8aeb3ec2fb
Corrected the fix for images with links
2012-07-15 13:12:24 +02:00
Michael Vogel
4e9086f9b0
Changes in the bbcode to markdown converter to make it more compatible with Diaspora
2012-07-15 12:47:24 +02:00
Michael Johnston
717fd8539b
add alt_pager function, add ability to use new pager logic on network, profile, community, and search.
2012-07-14 14:21:58 -04:00
