Commit graph

233 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
96abee53e4 this is better 2012-04-03 19:20:39 -07:00
friendica
dbe16afcd4 include contact_widgets for categories_widget when doing updates 2012-04-03 19:16:02 -07:00
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica
7c6c3d36f5 profile wall privacy 2012-03-27 01:31:47 -07:00
friendica
d9bee73edf community meta tag renamed from "ika" 2012-03-11 15:50:23 -07:00
friendica
7ad2dd6565 fix photos after permissions_sql change 2012-03-06 17:52:00 -08:00
Tobias Hößl
fd9c12128a should probably be a->user['hidewall'] instead of profile['hidewall'] 2012-02-26 20:39:37 +00:00
friendica
c8704040d3 improvements in newmember page 2012-02-16 01:57:59 -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
4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
friendica
c0c4c46874 remove hashchars from pub keywords 2011-12-20 03:04:20 -08:00
friendica
ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica
ee4975f1cd unnecessary slash in profile update path 2011-12-12 19:08:13 -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
3da3cd686c notifications refactor 2011-12-08 01:28:27 -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
Friendika
d4644d7339 name change continued, social graph tools and stuctures, fix for spanish province name 2011-10-31 20:39:04 -07:00
Friendika
4ea6f86b20 bug #166 2011-10-24 22:07:42 -07:00
Fabio Comuni
070e081ae9 Fix url in profile tabs 2011-10-10 16:40:12 +02:00
Fabio Comuni
f64e2d63b9 New common tab template. Update css 2011-10-10 15:28:34 +02:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
6a9e22550d . 2011-09-24 05:45:34 -07:00
fabrixxm
d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Friendika
9634287839 fix several probe related issues 2011-08-17 23:01:44 -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
Friendika
9b2ddb2cc2 auto-friend profiles showing up in directory as community pages 2011-07-28 19:18:07 -07:00
Fabio Comuni
e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Friendika
77cea581b0 better fix for bug #107, last one was flawed 2011-07-21 20:19:55 -07:00
Friendika
53653f6a4d consolidate perrmisions sql, minor duepuntozero validation fixes 2011-06-30 17:35:35 -07:00
Fabio Comuni
5de7d0f12f add profile tabs to "photos", "events" and "notes". in dispy, show active tab. 2011-06-23 11:30:17 +02:00
Friendika
e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Friendika
fb92dbf5d6 link events + personal notes to profile tabs 2011-06-13 20:32:30 -07:00
Friendika
86df81352f show new_member page only on our own profile 2011-06-03 06:22:39 -07:00
Friendika
32bebdfa7e new_member not new_user 2011-06-03 06:17:43 -07:00
Friendika
00c548cc8f new member page 2011-06-03 06:12:34 -07:00
Friendika
9f52e311df sort wall items by date order instead of id. bug #61 2011-05-30 19:59:54 -07:00
Friendika
69f014d02b bug #38 ability to restrict profile, wall, photos from non-friends 2011-05-28 00:49:03 -07:00
Friendika
4e8a97f30a bug #38 posts and photos only visible to friends if so configured 2011-05-28 00:42:01 -07:00
Friendika
e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Friendika
22cf6b3fe6 'mark seen' not getting all msgs on profile page 2011-05-20 19:28:48 -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
eeb3c13ad3 when public access is blocked, profile page should show login box 2011-04-21 18:39:07 -07:00
Friendika
9e19eef194 "firewall" setting - block all public pages from the public if configured to do so 2011-04-21 17:29:47 -07:00
Friendika
c0b7000a83 missing acl selector after merge 2011-04-20 05:51:02 -07:00
Friendika
e302741e49 merge status editor instances 2011-04-20 05:48:12 -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
5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Friendika
ff15ea0993 wrong variable passed 2011-04-11 15:45:19 -07:00
Friendika
c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -07:00
Friendika
a0956ee955 some w3c validation issues 2011-04-10 23:01:38 -07:00
Friendika
e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika
5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
Friendika
742bdd3054 make photo menu work better on remote profile logins 2011-04-04 05:52:59 -07:00
Fabio Comuni
fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Friendika
066bdca30d optionally set article title 2011-03-29 18:57:26 -07:00
Friendika
7defb1768b collapse posts by same author (but not you). 2011-03-27 20:37:44 -07:00
Friendika
b57214cb78 wrong date order profile page 2011-03-27 19:59:27 -07:00
Friendika
c962f5c4bc comment collapsing, pagination wasn't advancing past 16 2011-03-27 19:53:36 -07:00
Friendika
51447932f7 link same as visited 2011-03-24 01:16:14 -07:00
Friendika
d71db3e064 typo 2011-03-21 15:12:40 -07:00
Friendika
94cbf3bb80 another template down 2011-03-21 04:10:08 -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
53dcede278 pub_keywords -> meta keywords 2011-03-14 20:19:45 -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
9102fb3a6f autodiscover community pages for the directory 2011-02-27 14:17:42 -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
f7b2f9f5e7 convert update script arg passing to js - remembering the browser prefetch issues 2011-02-17 00:40:35 -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
837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Fabio Comuni
4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika
1460fc0d71 add cc-license text to all content pages 2011-01-23 14:56:14 -08:00
Friendika
2ffe0d0b1d do a better job of comparing same URLs. 2011-01-19 19:51:34 -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
5bfb0ba4c2 birthday notifications working 2011-01-13 20:28:33 -08:00
Friendika
fd1abe1c54 undo freesans temporarily due to poor legibility. 2011-01-06 13:26:25 -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