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
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
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
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
Domovoy
2a1657e361
Revert "Progress on #1 . Comments are now threaded, at least in the database, for normal view."
...
This reverts commit da1b47a029
2012-07-23 13:58:47 +02:00
Domovoy
da1b47a029
Progress on #1 . Comments are now threaded, at least in the database, for normal view.
2012-07-23 12:56:47 +02:00
friendica
9c72b45f36
and the main photo menu
2012-07-19 21:27:22 -07:00
friendica
d442bbc482
have fun...
2012-07-19 18:17:16 -07:00
friendica
02d88e7cbe
name mixup in wall-to-wall hovertips
2012-07-15 20:56:09 -07:00
friendica
7f7e2c5de0
add plink to profile notifications
2012-07-12 16:12:37 -07:00
friendica
085b589468
add some sparkle to plinks
2012-07-11 21:04:08 -07:00
Zach Prezkuta
da2ccebed8
fix bugs
2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a
allow more than one embedded private photo
2012-07-07 16:24:20 -06:00
friendica
6cc844b2f9
restore 'shareable' to feeds after recent feed privacy re-factoring
2012-06-30 05:16:30 -07:00
friendica
a3edbf7e5d
create third privacy state - public post but not searchable or publicly visible
2012-06-28 17:43:29 -07:00
friendica
1574396d04
sort out some "like" issues
2012-06-23 21:11:18 -07:00
friendica
7a346bc756
this is going to take some more debug before it can be roller out
2012-06-23 07:43:56 -07:00
friendica
22ca358a8c
like comments
2012-06-23 05:46:15 -07:00
friendica
7614d35cad
liking comments backend
2012-06-23 04:44:48 -07:00
Zvi ben Yaakov (a.k.a rdc)
ff2f7dfeef
Added App::get_cached_avatar_image usage on conversation wall of Normal View
2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
ac50c9e84d
Beginning to use App::get_cached_avatar_image for loading profile images in conversations
2012-06-19 16:05:38 -07:00
friendica
267681844d
poll even if contact hasn't responded recently, so we can update the termination status
2012-06-14 17:27:07 -07:00
friendica
3b9c3d886d
sheesh
2012-06-11 16:21:27 -07:00
friendica
daa4f5213f
zrl's when visiting public photos at the source site
2012-06-03 01:53:11 -07:00
friendica
29bdf432f0
fewer "bob smith to bob smith via wall-to-wall".
2012-06-02 00:40:38 -07:00
friendica
a163825291
redir links for permission controlled attachments
2012-05-21 22:54:39 -07:00
friendica
4e0b0d4e43
fix search/new against possible email leakage
2012-05-11 05:19:29 -07:00
friendica
20229ce187
better test of email reply visibility
2012-05-11 05:11:53 -07:00
friendica
53157bb954
send browser back to correct page (with query args) after posting
2012-05-09 04:18:01 -07:00
friendica
3c6cf1f19c
make comment edit icons look more like base theme
2012-04-26 19:55:20 -07:00
Tobias Hößl
720c8324c7
Some Bugfixes, and variable checks
2012-04-17 11:33:50 +00:00
friendica
fd2f7dd6ae
turn on comment edit
2012-04-16 03:51:48 -07:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
friendica
640f258f18
cleanup photo menus
2012-04-10 19:33:32 -07:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
friendica
e6fd6bfd89
more error handling
2012-03-31 17:44:34 -07:00
friendica
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
friendica
87539dbec4
bug #352 - qcomment plugin disabled, qcomments still allowed
2012-03-30 02:22:57 -07:00
friendica
9332312ce9
silly mistake
2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4
zrl on mentions
2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
friendica
6c7b619b34
remove stray template variable from old code
2012-03-20 23:57:33 -07:00
Tobias Hößl
72894b0e91
replace split() by explode(); split is deprecated
2012-03-18 10:36:49 +00:00
friendica
949c6d47b5
add "send pm" link to photo dropdown for Diaspora contacts
2012-03-16 15:19:38 -07:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
4972d7ef6e
more work on filer, comment level and file tag removal
2012-03-13 20:46:37 -07:00
friendica
be48fff157
file as widget and basic filing implementation for duepuntozero,slackr
...
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
Tobias Hößl
635958e11d
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 10:00:12 +00:00
friendica
312c175045
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
2012-03-09 00:31:17 -08:00
friendica
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Tobias Hößl
5bb8ed4b8b
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
2012-02-28 21:56:42 +00:00
Tobias Hößl
3d249f0edd
Merge remote branch 'upstream/master'
2012-02-28 21:19:02 +00:00
Tobias Hößl
1204210c69
wasn't actually changed before
2012-02-28 13:01:58 +00:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
Tobias Hößl
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
friendica
03171fd7de
preliminary qcomment support, [nosmile] tag to disable smiley processing
2012-02-14 23:13:18 -08:00
friendica
f865939653
localise links to private photos inside messages
2012-02-14 18:07:13 -08:00
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
friendica
5859f9dcf6
add render_location hook to both sets of conversations
2012-02-09 18:09:28 -08:00
friendica
ec26f88be9
render_location hook
2012-02-09 15:02:59 -08:00
friendica
2b77002471
basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).
2012-02-06 20:28:50 -08:00
friendica
3a1a4d62d9
bug #254
2012-01-24 16:23:30 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
6573c94d6c
modified item_photo_menu hook
2012-01-11 17:34:02 -08:00
friendica
cf7008e575
post preview to loozah
2012-01-10 17:47:11 -08:00
friendica
7011f71e8f
post preview
2012-01-09 20:03:00 -08:00
Fabio Comuni
f9b0af6f2f
Merge remote-tracking branch 'friendica/master'
2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac
Use html5 placeholder for title text input
2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d
Merge remote-tracking branch 'friendica/master'
2012-01-06 09:10:21 +01:00
friendica
b99cb511ca
comment preview
2012-01-05 16:38:24 -08:00
friendica
47edaf9ad7
dynamic title input box - via fabrixxm
2012-01-04 18:03:09 -08:00
friendica
969cd145ce
suggestion notifications
2012-01-03 17:29:07 -08:00
friendica
c583d16209
fix reference variable effects on sorting
2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9
Merge remote-tracking branch 'friendica/master'
2012-01-03 21:14:48 +01:00
friendica
184230e068
check count before foreach
2012-01-02 22:58:09 -08:00
friendica
4c35a6b0d7
conversation sql optimisations
2012-01-02 16:54:37 -08:00
Fabio Comuni
0b4535e6da
quattro: more on editor
2011-12-22 11:24:34 +01:00
Fabio Comuni
ba732c97c1
Merge remote-tracking branch 'friendica/master'
2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119
quattro: more on editor
2011-12-20 17:17:17 +01:00
friendica
7c6bc5a93d
invalid thread-id in "nouveau" mode of conversation, bug 245
2011-12-19 13:51:55 -08:00
friendica
fb01d8bec5
fix incorrect default author
2011-12-04 03:54:40 -08:00
friendica
fb437a874e
typo
2011-12-04 03:50:26 -08:00
friendica
f6dd834284
fix author-name when missing on comments
2011-12-04 03:45:09 -08:00
friendica
4b95e8ebe8
rework the liveupdate fixes - what a mess
2011-11-24 18:26:06 -08:00
friendica
9e8053e3bd
fixing conversation updates
2011-11-24 16:42:12 -08:00
friendica
53590d2166
rework show/hide comments
2011-11-22 16:00:05 -08:00
Fabio Comuni
ef8b5bc682
fix localize item tag
2011-11-16 11:27:20 +01:00
Fabio Comuni
962467ee68
item tags as array to templates
2011-11-15 17:41:38 +01:00
Friendika
199da623ff
testbubble showing post jot-tools on edit page - these are not changed so should not be visible
2011-11-10 18:20:25 -08:00
Friendika
3b6b0eaa8b
social tag - add UI
2011-10-24 15:47:17 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Friendika
7d6a67f903
mostly cosmetic changes to make DB tables accurately reflect the conversation members
2011-10-05 19:16:05 -07:00
Fabio Comuni
4d5580ab77
fix typo
2011-10-03 09:38:58 +02:00
Fabio Comuni
60e0f79b9f
Merge remote-tracking branch 'friendika/master'
2011-09-30 14:31:20 +02:00
Fabio Comuni
dfb3ee6e29
fix star icon viewing profile page as unlogged user
2011-09-30 14:31:01 +02:00
Friendika
c1221cc052
add display_item hook to 'search|new' message display
2011-09-29 15:52:31 -07:00
Fabio Comuni
41617ee987
fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme
2011-09-28 10:30:32 +02:00
Fabio Comuni
c120cc8ea9
added missing "delete selected items" link
2011-09-28 09:32:53 +02:00
Fabio Comuni
e986fc3e30
quattro: actions in wall_item
...
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Fabio Comuni
968e7bb3b1
Fixes for testbubble
2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358
Merge branch 'master' into newui
2011-09-26 11:42:48 +02:00
Friendika
3a2bf8ab7c
w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator
2011-09-23 03:12:31 -07:00
Friendika
c2ccb78869
template escapes
2011-09-19 19:51:14 -07:00
Friendika
63277b57fc
template escapes
2011-09-19 19:46:18 -07:00
Friendika
fd18b42a5a
Check all keys before use
2011-09-19 03:30:59 -07:00
Friendika
ce77c7287e
show real profile link location on hover
2011-09-16 15:40:34 -07:00
Fabio Comuni
6b6f45f9f1
quattro: initial style of conversations
2011-09-16 12:51:14 +02:00
Friendika
0e441fe196
bug #147 comments not working on private notes page
2011-09-11 15:09:57 -07:00
Friendika
1e8b3278b0
share not available in display module, as no editor window to paste into
2011-09-08 22:07:16 -07:00
Friendika
f0c3a75ff3
youtube redirect fixes
2011-08-30 23:09:39 -07:00
Friendika
144f241c5d
fix bad embeds
2011-08-26 15:21:21 -07:00
Friendika
04b59ac49a
enhanced email privacy
2011-08-11 01:52:31 -07:00
Friendika
0c9f033505
some api enhancements
2011-07-31 16:35:53 -07:00
Friendika
c0749f18d6
event ownership issues
2011-07-25 18:41:48 -07:00
Friendika
eccaa525cc
'dislike' is not part of activitystreams core schema - use symblic constants instead
2011-07-07 16:56:44 -07:00
Fabio Comuni
9dfd798368
Add post type "event" to like/unlike localizated text
2011-07-07 14:02:58 +02:00
Friendika
40aa6f33b5
incorrect links for "view in context" on community page
2011-07-05 21:03:37 -07:00
Friendika
5e1335ac89
don't show delete buttons on community page
2011-07-04 21:52:21 -07:00
Friendika
5ceeb6752d
starred items
2011-07-03 19:41:04 -07:00
Friendika
7f387d93ae
only show app on top-level or standalone posts
2011-06-21 00:56:24 -07:00
Friendika
55112cfdd0
item source
2011-06-20 19:08:40 -07:00
Friendika
9e2db5d5a6
tooltip for selecting items
2011-06-17 23:06:42 -07:00
Friendika
e5b54e74ba
delete selected items
2011-06-15 20:43:39 -07:00
Friendika
2a679b1164
file attachments
2011-05-25 02:08:15 -07:00
Friendika
bc8eba4884
turn on attach display
2011-05-24 20:45:02 -07:00
Friendika
87de839974
attachment display
2011-05-24 20:41:29 -07:00
Friendika
ea0a28ebfb
removed buggy debug code ;)
2011-05-22 14:20:31 -07:00
Friendika
681885a120
"notes" app
2011-05-20 01:15:02 -07:00
Friendika
990d5e82a0
doc updates - connecting to services
2011-05-18 17:29:12 -07:00
Friendika
85c6457e6e
bug #65 'show all nn comments', 'show more posts like this' are misleading after they've been clicked once. Solution, hide them once clicked.
2011-05-16 17:57:29 -07:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Friendika
a00813497f
bring back load_view_file for dispy templates
2011-05-10 23:35:31 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Friendika
be84d51767
use local contact photo if available
2011-05-09 01:35:24 -07:00
Friendika
2c63b65e3c
refactor "which link to show" logic
2011-05-06 06:30:33 -07:00
Friendika
64a7d0b578
lost comment boxes on status.net conversations
2011-05-03 18:05:11 -07:00
Friendika
6c47f262cc
warn if msg is visible to all
2011-05-01 19:50:00 -07:00
Friendika
7d455a0395
missing location after editor was consolidated
2011-04-28 20:04:02 -07:00
Friendika
a5d478233c
misspell
2011-04-26 18:39:19 -07:00
Friendika
cde17704dd
over-ride comment box
2011-04-26 18:36:51 -07:00
Friendika
e302741e49
merge status editor instances
2011-04-20 05:48:12 -07:00
Friendika
0af6014c94
keep space before t() for legacy string puller
2011-04-20 05:00:58 -07:00
Friendika
afe4cc8bfa
pull request #91 fabrixxm (manual merge)
2011-04-20 04:50:12 -07:00
Friendika
afdbbaf27d
photos_link not photo_link
2011-04-19 20:55:20 -07:00
Friendika
d874a55178
per contact network page (link in photo menu)
2011-04-19 20:50:02 -07:00
fabrixxm
1d8bd89fec
translate "like"/"dislike"/"friends with" messages at print time
2011-04-18 20:38:48 +02:00
Fabio Comuni
60fbe0b39b
translate verb items at display time
2011-04-18 17:37:02 +02:00
Friendika
ab099e9102
email integration, cont.
2011-04-17 23:27:11 -07:00
Friendika
c3b42fdbcb
it's tough getting the photo menu right in all circumstances. Lots of variables. Much better now.
2011-04-14 16:40:14 -07:00
Friendika
5654ce926c
move all message display sub-functions from boot.php into conversation.php
2011-04-12 17:58:16 -07:00
Friendika
4cb21fc60b
cleanup
2011-04-11 20:34:10 -07:00
Friendika
0ed2d19ac8
death to comment box oddities (a slow death as it will take some time for everybody to upgrade)
2011-04-11 20:11:21 -07:00
Friendika
a4836ac1ba
wallwall oddities on display page
2011-04-11 16:15:38 -07:00
Friendika
ff15ea0993
wrong variable passed
2011-04-11 15:45:19 -07:00
Friendika
9133a2384a
all conversations unified except photos
2011-04-11 01:31:04 -07:00
Friendika
a0956ee955
some w3c validation issues
2011-04-10 23:01:38 -07:00
Friendika
7192299ff1
first cut at profile page conversation
2011-04-10 21:43:44 -07:00
Friendika
a65c595b16
"display list of status items" moved to include/conversation.php,
...
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
2011-04-10 21:21:16 -07:00
