Commit graph

415 commits

Author SHA1 Message Date
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
friendica
53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica
8c4fbc3b4d add the bang 2012-03-24 03:11:45 -07:00
friendica
db5ec58863 network filter is now a permission group 2012-03-24 01:33:50 -07:00
friendica
224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica
110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica
7e270b043c addon settings form error 2012-03-13 23:52:13 -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
9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
friendica
93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
Michael Johnston
fd1f8fb436 allow user to set number of items to show on network page 2012-03-09 21:29:39 -05:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
03b5e3aa0c reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) 2012-03-07 21:12:31 -08:00
friendica
8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
friendica
4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08: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
friendica
07ca8d6574 starred/bookmark searches only returning conversation head without comments 2012-02-14 23:29:24 -08:00
friendica
b0ee8dd409 begin cmin, cmax 2012-02-08 17:56:23 -08:00
friendica
c68235d10d placeholder - spam tab on network page 2012-02-01 00:20:54 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -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
cdd56dc5de fix return url when deleting network posts with page params 2012-01-12 18:30:52 -08:00
friendica
dcc22ab5c5 improve direct login on network page 2012-01-11 13:38:03 -08:00
friendica
cfe8094b45 nets widget - allow all children of specified parent net regardless of network 2012-01-06 00:23:05 -08:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica
291a82c4a4 backend for per-network streams 2012-01-05 18:11:53 -08:00
friendica
0db637bf00 hopefully this will speed up the network updates a wee bit more 2012-01-02 19:33:26 -08:00
friendica
71377291ba that didn't work - revert 2012-01-02 18:50:28 -08:00
friendica
f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica
4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
friendica
4b09566579 try again on the network page sql optimisation 2012-01-02 03:40:52 -08:00
friendica
a5144518aa revert sql optimisation - js updates broken 2012-01-02 00:20:06 -08:00
friendica
fb3a0baa78 long running query on network page - optimise out the double sub-select 2012-01-01 23:07:53 -08:00
friendica
52137859eb improved cid search 2011-12-22 16:05:03 -08:00
friendica
048fcae40b bug #247 2011-12-21 01:45:15 -08:00
friendica
4007e7ec19 "new" view broken after liveupdate fixes 2011-12-14 03:51:50 -08:00
friendica
c45b903178 live update improvements 2011-12-12 16:11:03 -08:00
friendica
80428a33d5 refactor updates 2011-12-12 14:39:25 -08:00
friendica
341fcce75e preg_quote search strings 2011-12-06 19:51:19 -08:00
friendica
0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
73564df4d8 fine tune personal regex's 2011-11-29 22:49:05 -08:00
friendica
84e197cde9 missing paren 2011-11-29 19:53:18 -08:00
friendica
7474c48022 add tag to personal 2011-11-29 19:52:14 -08:00
friendica
7b9ba3bb03 personal tab on network page 2011-11-29 14:35:20 -08:00
friendica
a1c277ed1a remove old liveupdate marker 2011-11-24 18:46:07 -08:00
friendica
757ca5014c move liveupdate after birthdays/events 2011-11-24 17:32:45 -08:00
Fabio Comuni
a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
Friendika
4ea6f86b20 bug #166 2011-10-24 22:07:42 -07:00
Friendika
f48fd5aa16 more tagging 2011-10-24 04:17:46 -07:00
Friendika
19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika
0f24f3b505 post/comment order options 2011-10-17 18:24:23 -07:00
Friendika
2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
2011-10-11 19:27:58 -07:00
Fabio Comuni
f64e2d63b9 New common tab template. Update css 2011-10-10 15:28:34 +02:00
Friendika
4a5079f8fb urlescape saved search terms 2011-10-04 05:19:25 -07:00
Devlon Duthie
0881c04cea classes added to core + testbubble theme
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Devlon Duthie
3426ce5f94 Merge remote-tracking branch 'upstream/master' 2011-09-25 13:30:55 -05:00
Devlon Duthie
cb1c6dd1e3 really commiting files this time, still getting the hang of git.
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
2011-09-25 13:20:19 -05:00
Friendika
6a9e22550d . 2011-09-24 05:45:34 -07:00
Friendika
7ea6b0a126 fix message ordering glitch on network page 2011-09-23 05:03:12 -07: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
8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Fabio Comuni
9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika
12fec75489 ability to re-order network page (no UI yet) 2011-09-13 18:40:15 -07:00
Friendika
21d35e52dd provide option for viewing by parent created order 2011-09-13 05:13:01 -07:00
Friendika
4f24494b0b Dreamhost's unreliable process model is really getting irritating 2011-09-12 19:42:10 -07:00
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni
ad7c111c7c deal with messages without comments or likes 2011-09-08 14:39:53 +02:00
Fabio Comuni
694e74d54d Show conversations in network default view ordered by activity 2011-09-08 11:18:44 +02:00
Friendika
eeecb412aa view bookmarks 2011-09-06 00:55:24 -07:00
Fabio Comuni
0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Fabio Comuni
d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika
ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
fabrixxm
07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika
b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Fabio Comuni
e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Friendika
6b806708d9 typo 2011-07-21 20:21:41 -07:00
Friendika
77cea581b0 better fix for bug #107, last one was flawed 2011-07-21 20:19:55 -07:00
Friendika
f4b4f61f66 provide fake first arg to ajax updater 2011-07-21 17:55:15 -07:00
Friendika
cd7098501e change wording of "new item view" to be consistent 2011-07-03 20:18:20 -07:00
Friendika
5ceeb6752d starred items 2011-07-03 19:41:04 -07:00
Friendika
b1aa77584f indicate currently selected group in group picker 2011-07-01 06:14:15 -07:00
Friendika
38cf37d3c3 new item view, sort by received date - not posted date. 2011-06-23 17:56:59 -07:00
Friendika
341f853b04 search from network page 2011-05-26 17:47:33 -07:00
Fabio Comuni
e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message.
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
Friendika
22cf6b3fe6 'mark seen' not getting all msgs on profile page 2011-05-20 19:28:48 -07:00
Friendika
5f0b43485a incorrect count of total pages in normal view mode 2011-05-04 20:49:11 -07:00
Friendika
69dc17eb81 when viewing network group, show my private conversations to the group 2011-04-30 21:53:51 -07:00
Friendika
a01c40a845 no insecure warning on FB connections 2011-04-26 05:45:53 -07:00
Friendika
e302741e49 merge status editor instances 2011-04-20 05:48:12 -07:00
Friendika
3787e1e500 provide disclosure warning on private network page 2011-04-19 21:09:25 -07:00
Friendika
d874a55178 per contact network page (link in photo menu) 2011-04-19 20:50:02 -07:00
Friendika
a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika
ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika
f04e2e7044 edit group links on network page 2011-04-12 18:22:58 -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
a4836ac1ba wallwall oddities on display page 2011-04-11 16:15:38 -07:00
Friendika
c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -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
Friendika
5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
Fabio Comuni
92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Friendika
9b50b0e16f Public exposure warning on affected network group pages. config-able so a plugin can shut it up. 2011-04-03 20:41:40 -07:00
Fabio Comuni
fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Fabio Comuni
3f94721d62 first work 2011-03-30 17:10:14 +02:00
Friendika
066bdca30d optionally set article title 2011-03-29 18:57:26 -07:00
Friendika
920396e402 off by one 2011-03-28 20:06:45 -07:00
Friendika
00b5f6f8a1 added comments, make typo checker work with redefined plural string functions 2011-03-28 17:24:11 -07:00
Friendika
1f6c6c466a author collapse: close off before pagination 2011-03-28 00:49:20 -07:00
Friendika
77fbd2f78c tweaks to author collapsing 2011-03-27 20:43:45 -07:00
Friendika
7defb1768b collapse posts by same author (but not you). 2011-03-27 20:37:44 -07:00
Friendika
c962f5c4bc comment collapsing, pagination wasn't advancing past 16 2011-03-27 19:53:36 -07:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika
9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika
47f0abf27e no sharing icon for private msgs 2011-03-16 22:04:00 -07:00
Friendika
334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika
3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika
5f54503780 Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11 2011-03-09 00:17:47 -08:00
Friendika
0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Fabio Comuni
33264dc294 Add title attribute to location links 2011-03-08 16:50:10 +01:00
Friendika
989b1b209e one more template free from translation, allow for later item editing within jot.tpl 2011-03-07 19:58:22 -08:00
Friendika
58eba782cf more tweaks #13 2011-03-06 19:48:46 -08:00
Friendika
26c4054652 more improvements on sparkle links bug #13 2011-03-06 19:43:03 -08:00
Friendika
7f1f18675c sparkle links for friends-of-friends, bug #13 2011-03-06 19:24:01 -08:00
Friendika
fecef140d5 new item view: sparkle links not redirecting 2011-03-04 21:27:38 -08:00
Friendika
bfdf4bddc9 "New Item View" had no magic sparkle links 2011-03-02 16:19:38 -08:00
Friendika
80ed4242ee singleuser site mode plus fix search template layout 2011-02-28 19:44:47 -08:00
Friendika
3308a69320 increase visibility of group filter 2011-02-28 02:56:46 -08:00
Friendika
5641532936 yet another template 2011-02-24 02:46:06 -08:00
Friendika
c98ed12e10 generalise wallwall template and fix "via wall-to-wall" float 2011-02-24 02:32:46 -08:00
Friendika
979307ef91 ajax testing continues 2011-02-17 00:52:26 -08:00
Friendika
f7b2f9f5e7 convert update script arg passing to js - remembering the browser prefetch issues 2011-02-17 00:40:35 -08:00
Friendika
3cc63f2e6f issues found when testing all live network modes 2011-02-16 23:18:43 -08:00
Friendika
0435236192 error return for update process when invalid group 2011-02-16 23:10:18 -08:00
Friendika
9f8b6dff1c ajax live update for all network pages and subpages 2011-02-16 23:05:48 -08:00
Friendika
4bff52990e ajax reload fixes 2011-02-16 21:17:49 -08:00
Friendika
9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -08:00
Friendika
3d9845f4a4 preliminary ajax comment setups 2011-02-12 03:14:59 -08:00
Friendika
c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika
4e63b0acb9 ensure that jot_plugins inherit '$visitor' correctly 2011-02-06 01:08:12 -08:00
Friendika
777c47aaa6 silence a few notice warnings 2011-02-01 20:23:58 -08:00
Friendika
837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika
05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed 2011-01-26 13:59:20 -08:00
Fabio Comuni
4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika
bb5ad77e2a smilies on new item view 2011-01-25 05:26:12 -08:00
Friendika
1460fc0d71 add cc-license text to all content pages 2011-01-23 14:56:14 -08:00
Friendika
aeb585fee1 profile edit hooks 2011-01-20 15:30:45 -08:00
Friendika
623ae24109 per fabrix, except do the login "on page" 2011-01-20 14:25:44 -08:00
fabrixxm
28ebbe38d6 Netwok page redirect to login page if not local_user 2011-01-20 20:19:20 +01:00
Friendika
2ffe0d0b1d do a better job of comparing same URLs. 2011-01-19 19:51:34 -08:00
Friendika
d59585d89d fix context links 2011-01-19 18:31:04 -08:00
Friendika
b1d67c8d3c network view all item types by date 2011-01-19 17:56:36 -08:00
Friendika
3da2b24951 list network page (parent items) by creation date thx:fabrix 2011-01-18 19:41:30 -08:00
Friendika
3811923c14 put birthday reminders on default network page, add smileys to private mail 2011-01-16 16:40:09 -08:00
Friendika
0cba6b128a fix typo, check for empty group in network page 2011-01-03 13:53:26 -08:00
Friendika
a51a1007a3 email check failed, translate wall_item template 2011-01-03 13:26:43 -08:00
Friendika
b211adfb12 more hooks 2010-12-25 17:46:25 -08:00
Friendika
eb13833d2a smiley filter 2010-12-08 17:05:51 -08:00
Friendika
a42b9ea3de display the fact that a conversation is private without disclosing the details of who can/cannot see it. 2010-12-07 20:47:53 -08:00
Friendika
e59377d96b highlight any messages on page newer than 12 hours 2010-12-07 16:27:30 -08:00
Friendika
75306b6294 allow community page members to upload photos and assorted other stuff which was previously restricted to the page owner 2010-12-05 18:08:36 -08:00
Friendika
09117b1dc7 she'll be right 2010-11-21 17:44:59 -08:00
Friendika
83e3cc34d2 something wrong - undo last checkin until fixed 2010-11-21 17:38:27 -08:00
Friendika
72fd6eec4b make sure to use local avatar if we have one 2010-11-21 17:36:01 -08:00
Friendika
8c395f96de view directory cleanup 2010-11-15 21:02:59 -08:00
Mike Macgirvin
f0b6400584 more lint 2010-10-31 16:38:22 -07:00
Mike Macgirvin
fab63ca751 -Wall cleanup 2010-10-30 13:25:37 -07:00
Mike Macgirvin
1335ef7595 no sparkle on federated network 2010-10-24 21:10:52 -07:00
Mike Macgirvin
b41218ca30 workflow for federated/non-dfrn followers 2010-10-24 20:39:24 -07:00
Mike Macgirvin
a8e4ec7801 use browser geolocation when desired 2010-10-19 20:52:05 -07:00
Mike Macgirvin
ac824fe83e eradicate redundant get_uid function 2010-10-18 14:34:59 -07:00
Mike Macgirvin
511c761fec group/community/celebrity pages 2010-10-18 00:43:49 -07:00
Mike Macgirvin
7ad27f5737 implement rel alternate, some corresponding last minute touchups on display module 2010-09-30 16:06:53 -07:00
Mike Macgirvin
dda5195418 show members of locked conversations 2010-09-29 22:11:26 -07:00
Mike Macgirvin
18287a3656 show lockstate on messages, sparkle failure on profile page,
comments on typo checker
2010-09-28 22:12:27 -07:00
Mike Macgirvin
27946c102d animate the sparkler, author was getting sparkled on own page 2010-09-27 22:43:30 -07:00
Mike Macgirvin
55351114fa you and me babe 2010-09-27 19:58:37 -07:00
Mike Macgirvin
01d36785b0 fixed photo comments, msg typo, and changed cursor when hovering
over "special friends" where SSO is allowed
2010-09-27 19:48:45 -07:00
Mike Macgirvin
34eedb503a stronger type checking on comparisons 2010-09-26 17:24:20 -07:00
Mike Macgirvin
d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin
a428695f8e pass vars via javascript, not html. Also fix broken pause img on IE 2010-09-20 22:27:33 -07:00
Mike Macgirvin
3ad52463f6 more robust feed error handling, at the expense of performance.
Pass profile owner through HTML (yuk) to the ajax updater - as
browser  pre-fetch totally buggers passing it via the server session.
2010-09-20 19:34:44 -07:00
Mike Macgirvin
65a420b227 theme cleanup 2010-09-18 21:11:18 -07:00
Mike Macgirvin
4eb1c1eb1a our implementation of "aspects" functionally complete 2010-09-17 03:43:03 -07:00
Mike Macgirvin
a50947a4bc like, dislike, activity streams, etc. 2010-09-17 03:10:19 -07:00
Mike Macgirvin
024f2019e6 store default location 2010-08-21 16:31:46 -07:00
Mike Macgirvin
0ea5e7fc95 fat fringers 2010-08-19 19:07:19 -07:00
Mike Macgirvin
e0045a43e2 mongo checkin, global directory, redir rework, location basics 2010-08-19 04:59:31 -07:00
Mike Macgirvin
e9a0d07f3a cleanup 2010-08-13 05:52:28 -07:00
Mike Macgirvin
485708bd9a tweaking sql for netwrk page 2010-08-13 05:47:16 -07:00
Mike Macgirvin
1f2f483531 bare naked linefeed \n crept into SQL 2010-08-11 21:45:27 -07:00
Mike Macgirvin
3d7bb9c37c network groups now filtered by parent in group 2010-08-11 15:40:18 -07:00
Mike Macgirvin
f4e634ad52 group drop 2010-08-11 01:48:43 -07:00
Mike Macgirvin
9662c44a17 even more fixes 2010-08-10 21:22:36 -07:00
Mike Macgirvin
5933f13ab7 default acl's 2010-08-07 23:54:22 -07:00
Mike Macgirvin
2e5fb9c37e lots of formatting, bug fixes on profile updates, i18n 2010-07-27 19:27:14 -07:00
Mike Macgirvin
17808daf5e item delete 2010-07-26 04:22:19 -07:00
Mike Macgirvin
9f81c3345b fixup of some nits with live update and remote comment display on profile page 2010-07-25 22:51:45 -07:00
Mike Macgirvin
52a2c7eb46 group select on network page 2010-07-25 16:27:22 -07:00
Mike Macgirvin
fc8379b108 live updates sort of working 2010-07-24 23:20:20 -07:00
Mike Macgirvin
6368bd1656 more live update 2010-07-24 15:21:33 -07:00
Mike Macgirvin
a93f5627c1 live update 2010-07-24 06:56:02 -07:00
Mike Macgirvin
1db8ab907b css change to allow live inserts 2010-07-24 05:52:29 -07:00
Mike Macgirvin
466267fbb5 lotsoflittlestuff 2010-07-20 05:21:19 -07:00
Mike Macgirvin
6695b4a203 more bugs 2010-07-19 06:58:03 -07:00
Mike Macgirvin
9b0584e593 revamp of item structure 2010-07-18 23:23:18 -07:00
Mike Macgirvin
21f0cd206d more poll stuff ahead of item revamp 2010-07-18 20:49:10 -07:00
Mike Macgirvin
aff4f63ff8 remote comments working now 2010-07-17 19:26:00 -07:00
Mike Macgirvin
2a17c20fb8 remote comments - though still needs a bit more work 2010-07-17 07:03:06 -07:00
Mike Macgirvin
f937de932d fixing stuff that broke with the last big code push 2010-07-16 23:14:37 -07:00
Mike Macgirvin
5e4df4b3f7 added network page 2010-07-16 17:16:50 -07:00