friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3909 commits 1 branch 22 tags 59 MiB
Commit graph

1415 commits

Author SHA1 Message Date
fabrixxm bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika 673e114bbd D* like and start of relay code 2011-08-16 22:31:14 -07:00
Friendika b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika c7197b99f9 refactor the diaspora contact logic 2011-08-15 23:19:17 -07:00
Friendika 0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika a589e8e3fe filename typo 2011-08-15 20:47:09 -07:00
Friendika 37a9a5ea62 stupid browsers not honouring meta base 2011-08-15 20:16:00 -07:00
Friendika 8e3506048a diaspora confirm cleanup 2011-08-15 19:31:45 -07:00
Friendika f7a1674cf6 set proper relation for diaspora in mod_follow 2011-08-15 19:15:56 -07:00
Friendika 240941237a privacy enforcement on pubmail_enable 2011-08-15 18:29:49 -07:00
Friendika a6d88fb8f7 diaspora friend approvals 2011-08-15 18:17:19 -07:00
Friendika 44918e2736 turn diaspora posts into x-www-form-urlencoded 2011-08-15 17:14:51 -07:00
Friendika 5d6155a968 fixes share from diaspora 2011-08-15 05:27:24 -07:00
Friendika 0729e205c8 diaspora follow from friendika 2011-08-14 20:38:31 -07:00
Friendika 7952961222 diaspora probe/scrape changes 2011-08-14 18:13:52 -07:00
Friendika 3a0727d496 set network correctly - dfrn_confirm 2011-08-14 05:26:44 -07:00
Friendika fcf6651299 add diaspora support to dfrn_confirm (friendship confirmation) 2011-08-14 05:23:36 -07:00
Friendika bbd545b9ca honour "post to xxx network by default" when using API 2011-08-14 04:26:41 -07:00
Friendika e1db136966 but #118 proxy settings in admin panel 2011-08-12 04:05:20 -07:00
Friendika aefc6209a3 improved diaspora discovery 2011-08-12 03:01:11 -07:00
Friendika fda593caed introduction fails if confirmation differs by http vs https 2011-08-12 02:58:29 -07:00
Friendika 0db145dafa redirect to home after logging in using login url 2011-08-11 04:28:06 -07:00
Friendika 72873cd827 diaspora function dispatcher 2011-08-10 05:10:48 -07:00
Friendika 1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika 70017ebb8c diaspora encrypt+decrypt working !! 2011-08-09 02:53:51 -07:00
Friendika 7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika 0745c00b16 guids on items 2011-08-07 17:33:13 -07:00
Friendika 8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika 1eec10329a guid functions 2011-08-07 16:56:26 -07:00
Friendika 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika 1d659bd854 move public profile warning to top of page 2011-08-05 06:42:27 -07:00
Friendika 5a5a7bfc4c fallback sha256 openssl_verify code for php releases prior to 5.3 2011-08-05 05:37:42 -07:00
Friendika 6eec04b09c updates to Diaspora decrypt/verify from recent testing 2011-08-05 01:34:32 -07:00
Friendika 2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika f0af4de4a7 wrap text from imported link in [quote] 2011-08-04 19:19:51 -07:00
Friendika d45a66e700 allow custom avatar sizes - needed for Diaspora hcard/vcard 2011-08-03 21:05:39 -07:00
Friendika ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika d0b7723bbc re-parent api post item with parent_id and no parent_uri 2011-08-03 16:29:25 -07:00
Friendika e22e823e93 allow group selection from contact edit page 2011-08-02 22:39:35 -07:00
Friendika 2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika 996425206f api profiles 2011-07-31 20:01:00 -07:00
Friendika b0a9ec0a73 better handling of api comments/replies 2011-07-31 17:52:36 -07:00
Friendika 60caffcd77 convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field 2011-07-30 01:03:24 -07:00
Friendika 01703f3be6 get_diaspora_key() 2011-07-30 00:51:59 -07:00
Friendika a61ec584d6 basic diaspora decryption 2011-07-30 00:31:00 -07:00
Fabio Comuni ac6945eed1 Merge remote-tracking branch 'friendika/master' 2011-07-29 17:23:09 +02:00
Fabio Comuni 0111a1231c re-add pending registrations in ping.php, for admin side menu 2011-07-29 17:14:35 +02:00
Fabio Comuni d88ed393f8 notify pending registrations 2011-07-29 16:24:09 +02:00
Friendika 9b2ddb2cc2 auto-friend profiles showing up in directory as community pages 2011-07-28 19:18:07 -07:00
Friendika 04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Friendika c74f0f0cab show full size photos for album view even when photo has been used as a profile photo 2011-07-28 01:01:19 -07:00
Friendika 822fea9d9d installer text changes 2011-07-27 21:48:02 -07:00
Friendika b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika 454ff3c7f0 configurable format for date input selectors 2011-07-25 20:59:25 -07:00
Fabio Comuni 99ab06bad3 js to open close popup nav menu and to populate notification menu via ping. 
Update mod/ping to return details about messages and intros
 2011-07-25 16:54:39 +02: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 1d7d4bf8c6 wrong path for salmon verify 2011-07-20 23:14:43 -07:00
Fabio Comuni 7a069c1438 Load tinyMCE on post editor only if needed. 2011-07-20 11:08:42 +02:00
Friendika b27d68633b register hook 2011-07-19 23:10:09 -07:00
Friendika e2f22a1827 diaspora salmon endpoint (decryption not yet provided) 2011-07-19 21:23:47 -07:00
Friendika 1d35d1e5a1 Merge pull request #141 from fabrixxm/newacl 
New jot ACL selector
 2011-07-19 17:24:09 -07:00
Fabio Comuni 9debbfde1e fix group image name 2011-07-19 16:25:40 +02:00
Fabio Comuni 9fa0956966 New jot acl selector 2011-07-19 16:17:58 +02:00
Friendika c0b8e63a3f basic diaspora discovery 2011-07-18 18:13:46 -07:00
Friendika 1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika 43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika 944f03d367 change license 2011-07-17 03:34:16 -07:00
Friendika f35a61761a Merge pull request #139 from fabrixxm/update 
Experiment with on-line update
 2011-07-15 01:29:46 -07:00
Friendika 74a608e1c7 openid settings appearing when disabled, don't tag numbers, install admin not getting set 2011-07-12 23:14:38 -07:00
Friendika 706b6e8c84 email notifications not working - unable to change notification settings 2011-07-12 05:09:07 -07:00
Friendika 55bbe2108a event ownership from remote feeds messed up, this is one step - may require more 2011-07-12 01:24:07 -07:00
Friendika 2a65d01ce2 several fixes to parse_url 2011-07-11 17:23:42 -07:00
Friendika 35edf79abe bug #102 2011-07-09 15:06:53 -07:00
Fabio Comuni 4fdc5ff30c First test for friendika "live" update 2011-07-08 17:12:08 +02:00
Friendika 2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
Friendika d99dfbe4ef friendika-z configuration details in admin page 2011-07-07 18:25:56 -07:00
Friendika d7b5a606fb don't show mailbox settings at all if disabled 2011-07-06 20:27:18 -07:00
Friendika 3f25830076 more friendika-z 2011-07-06 20:16:40 -07:00
Friendika 94ca19c016 a few minor fixes to settings page 2011-07-06 16:47:55 -07:00
Fabio Comuni e7834e60f8 Update settings page to use field templates. 
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
 2011-07-06 12:10:00 +02:00
Friendika 84d12c3e08 move hidewall to user table - queries are getting too complicated and servers falling over 2011-07-05 23:23:43 -07:00
Friendika c221d5ea59 honour hidden profiles on display item page 2011-07-05 21:11:38 -07:00
Friendika d7154a4606 ability to link contacts that are "really me, but on another system/network". 2011-07-05 19:55:09 -07:00
Friendika 76e56fd44e begin work on relocation conversation 2011-07-05 19:19:11 -07:00
Friendika 24d41e2c6e purify html before trying to parse wild urls. This way at least it should parse. 2011-07-04 23:02:04 -07:00
Friendika 5e1335ac89 don't show delete buttons on community page 2011-07-04 21:52:21 -07:00
Friendika 1048ee744e reversed logic 2011-07-04 21:13:10 -07:00
Friendika 20d3aa2e77 community page 2011-07-04 20:57:07 -07:00
Friendika 78363ecfb1 msearch typo 2011-07-04 00:46:23 -07:00
Friendika a82e0e32b3 add site info to site json response 2011-07-04 00:44:25 -07:00
Friendika e795d1265e show keywords in match results 2011-07-03 21:30:48 -07:00
Friendika cd7098501e change wording of "new item view" to be consistent 2011-07-03 20:18:20 -07:00
Friendika 07ea67e33b removed stray debug statement 2011-07-03 19:57:20 -07:00
Friendika 5ceeb6752d starred items 2011-07-03 19:41:04 -07:00
Friendika bef68a8c7f posts from hidden walls not allowed in search results 2011-07-03 05:54:40 -07:00
Friendika 3538dc15cc improved search - ensure you can see all your own content (logged in members). Visitors can only see public wall posts. 2011-07-03 05:00:11 -07:00
Friendika e6aaa8b59b use local 'match people with my interests' if global directory is not configured 2011-07-02 01:21:56 -07:00
Friendika c23657ab6e also check for blocked 2011-07-01 17:45:00 -07:00
Friendika 9816f14d40 statusnet improvements 2011-07-01 17:39:16 -07:00
Friendika f53a2d6da9 add group highlight to other pages 2011-07-01 06:23:09 -07:00
Friendika b1aa77584f indicate currently selected group in group picker 2011-07-01 06:14:15 -07:00
Friendika 086dc25dd1 logic reversed 2011-06-30 23:23:50 -07:00
Friendika 762fb878f8 don't allow editing of somebody else's event 2011-06-30 23:21:58 -07:00
Friendika 53653f6a4d consolidate perrmisions sql, minor duepuntozero validation fixes 2011-06-30 17:35:35 -07:00
Friendika 8819c73ba1 bug #99 - don't show album name/link if photos are private 2011-06-30 03:39:08 -07:00
Friendika 3eb0b4be2a now that we have admin interface, completely remove register approvals from notifications 2011-06-29 22:38:30 -07:00
Friendika 58d474aa2d switch to text mode group editor after 'n' contacts 2011-06-29 20:42:16 -07:00
Friendika ae0275ec2c collapse multiple spaces in usernames 2011-06-29 19:26:18 -07:00
Friendika ad5b976978 allow spaces in @ tags 2011-06-29 18:59:05 -07:00
Fabio Comuni f4a1820110 re-added last item date in admin user page. relative_date return 'never' if null is passed 2011-06-29 16:06:32 +02:00
Fabio Comuni 1e307e9869 Fix bug #98, add "never" to relative_date(), fix batch operations 2011-06-29 12:05:09 +02:00
Friendika 2a57847816 don't allow blocked/unverified users to reset their password. 2011-06-29 00:59:21 -07:00
Friendika 62340ba86b get app structure needed in regmod 2011-06-29 00:40:43 -07:00
Friendika d5855967a7 do not translate hidden photo album 'Contact Photos' as it may become unhidden when different language is used. 2011-06-28 22:33:02 -07:00
Friendika 0b221e8945 bug #96 move libraries to library - better alignment of like rotator 2011-06-28 21:11:52 -07:00
Friendika 4ca6a9a382 dbg info for photo uploads 2011-06-28 18:59:41 -07:00
Friendika 932397b47b trim webfinger request 2011-06-27 19:47:55 -07:00
Friendika 4418cb4349 preformat webfinger output 2011-06-27 18:13:44 -07:00
Friendika 1947b74e5b some basic margins for friend suggestion screen 2011-06-27 16:18:06 -07:00
Friendika 14c002d7a4 make friend suggest themeable 2011-06-27 03:09:45 -07:00
Friendika 06a4c0f703 ignore current contact on friend suggestion picker 2011-06-27 03:03:58 -07:00
Friendika c410c9013c friend suggestions 2011-06-26 22:57:08 -07:00
Friendika 23f00aaab4 recipient ui, friend suggestions 2011-06-26 21:55:24 -07:00
Friendika 3fe1e19725 pass notify endpoint with friend suggestions 2011-06-26 19:30:57 -07:00
Friendika c9604ef578 allow cross-site xrd/lrdd/webfinger 2011-06-25 19:40:37 -07:00
Friendika 59d9070d13 suggestion template 2011-06-25 19:10:38 -07:00
Friendika e320975d73 bug #95 2011-06-23 22:23:26 -07:00
Friendika a15bd91d17 don't update an event that hasn't changed. 2011-06-23 18:25:33 -07:00
Friendika 38cf37d3c3 new item view, sort by received date - not posted date. 2011-06-23 17:56:59 -07:00
Friendika 5633430a19 don't allow tags in app source 2011-06-23 15:58:43 -07:00
Friendika fa778e0040 Merge pull request #126 from fabrixxm/dispy 
Dispy
 2011-06-23 04:10:12 -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 96857389ac friendika-z initial implementation 2011-06-23 01:57:14 -07:00
Friendika c23c366ff6 receive friendship suggestion over the wire (dfrn) and store 2011-06-22 19:08:30 -07:00
Friendika 55112cfdd0 item source 2011-06-20 19:08:40 -07:00
Friendika 285d617569 using pre - one less str_replace for log viewing 2011-06-20 16:10:03 -07:00
Friendika de24f68112 module to provide local "find people like me" when global dir unavailable 2011-06-20 05:14:42 -07:00
Friendika b56e00c7c5 api post sort of working - output status,user need to be swapped 2011-06-19 20:13:24 -07:00
Friendika c2dcff0d02 move profile privacy settings to the Privacy section of the Settings page 2011-06-19 16:47:03 -07:00
fabrixxm 001982cac0 Change logic in admin.php to load plugin settings form. Add statusnet settings form. 2011-06-19 15:43:10 +02:00
fabrixxm 4b633d54bb admin: fix last item date in users list, fix plugins details template 2011-06-18 08:52:51 +02:00
fabrixxm 23931ab719 Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example. 2011-06-18 08:29:59 +02:00
Friendika 484b248f73 add pagination to admin/user page to support large numbers of users 2011-06-17 16:21:11 -07:00
Friendika 4ca730e5d7 remove debug statements 2011-06-16 23:17:25 -07:00
Friendika fb0b22fb13 fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div) 2011-06-16 22:20:12 -07:00
Friendika b61a7158da Merge pull request #116 from fabrixxm/admin 
Admin pages
 2011-06-16 15:27:12 -07:00
Fabio Comuni ede011cc32 Admin users page. some fix to template processor. 2011-06-16 14:56:43 +02:00
Fabio Comuni 5f583fb8d6 Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations. 2011-06-16 12:05:35 +02:00
Friendika c92e6ed929 avoid race condition on delete checked items 2011-06-16 00:38:41 -07:00
Friendika e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Friendika cee63c7a0d preserve original timezone adjust selection when editing events 2011-06-14 21:44:27 -07:00
Friendika ca84823437 Dear $username not expanded/replaced in text emails 2011-06-14 20:49:25 -07:00
Friendika 5105b3febc event calendar links, editing 2011-06-14 19:48:37 -07:00
Fabio Comuni 00e142e4f7 Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page 2011-06-14 14:21:43 +02:00
Fabio Comuni 25d1637ec4 simple plugin details and log view in admin 2011-06-14 11:54:14 +02:00
Fabio Comuni 5dc8fbccb2 enable/disable plugins from admin page 2011-06-14 11:16:27 +02:00
Fabio Comuni b1184f3fde Merge remote-tracking branch 'friendika-master/master' into admin 2011-06-14 10:37:54 +02:00
Fabio Comuni 5882d8d022 Initial plugins admin page 2011-06-14 10:35:56 +02:00
Friendika 4469f92ea3 prev/next icons (instead of text) for photos 2011-06-13 21:43:21 -07:00
Friendika 05eb9ceaba avoid returning events from getting posted again 2011-06-13 20:42:37 -07:00
Friendika fb92dbf5d6 link events + personal notes to profile tabs 2011-06-13 20:32:30 -07:00
Friendika d5fdd4287d event sharing, cont. 2011-06-13 19:06:49 -07:00
fabrixxm 4ba23df20a fix a typo in site settings page 2011-06-13 18:29:14 +02:00
Fabio Comuni ab27f1393e Admin site page 2011-06-13 18:03:06 +02:00
Fabio Comuni 3364c2a2d8 Initial admin page 2011-06-13 12:52:29 +02:00
Friendika 7c60701efc fixed a few feed problems affecting activity objects/targets 2011-06-10 01:51:14 -07:00
Friendika b857a49bfe event publish 2011-06-09 21:23:45 -07:00
Friendika 8aaf55c1e6 event item 2011-06-09 20:02:48 -07:00
Friendika 9203b48527 default event publish permissions = personal 2011-06-09 01:01:29 -07:00
Friendika d371241e66 events 2011-06-09 00:58:45 -07:00
Friendika 894dfde122 set permalink on photo tags 2011-06-08 22:34:22 -07:00
Friendika dea721a3f8 minor fixes to apps (don't show notes if not logged in) and photos (tag delete link is leaking to unauthorised users) 2011-06-08 21:43:32 -07:00
Friendika df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -07:00
Friendika a10abd4860 remove event if attached item is deleted 2011-06-08 00:47:00 -07:00
Friendika 0bfb6314df default uploaded photo permissions were wrong 2011-06-07 22:47:15 -07:00
Friendika e2f1540f25 events, continued. Also better regex matching accounting for empty elements 2011-06-07 22:13:07 -07:00
Friendika 33fe26ecb0 more progress on events 2011-06-07 20:10:43 -07:00
Friendika d2863d1859 first recently uploaded photo (in 3 hours) to an older existing album, post made visible 2011-06-07 16:23:37 -07:00
Friendika c1b2e90e37 basic saving of events 2011-06-06 22:27:38 -07:00
Friendika fcb4316c29 tinymce for event fields 2011-06-06 21:49:07 -07:00
Friendika bbc65f9832 prev/next links in calendar 2011-06-06 21:28:11 -07:00
Friendika 9f51233451 event listings 2011-06-06 20:17:36 -07:00
Friendika 452245d988 more events framework 2011-06-06 19:59:20 -07:00
Friendika c0094aa4f8 strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues 2011-06-06 16:26:11 -07:00
fabrixxm 76f4d85d9a Small fix to theme selector 2011-06-06 14:55:54 +02:00
Friendika 4c629e274b begin event module 2011-06-05 23:10:07 -07:00
Friendika 18f4c6094a bug #88, Thanks Chris! Added a couple of minor tweaks for identity checking and consistency with other profile viewing links 2011-06-05 21:05:55 -07:00
Friendika edbad772ba add flag for experimental themes 2011-06-05 18:05:25 -07:00
Friendika 6f34f89ddb mb_string is now required. 2011-06-04 22:48:43 -07:00
Friendika e591ed6b30 minor edits 2011-06-03 07:04:43 -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 20d1de4ced got it wrong - apparently no need to fix json slashes 2011-06-02 20:42:09 -07:00
Friendika 55e727de64 make 'visible to everybody' warning toggle correctly in photos and settings 2011-06-01 22:06:53 -07:00
Friendika 969a25eab2 add titles to shared items if available 2011-06-01 06:41:12 -07:00
Friendika b8c4d73377 show group affiliations in contact editor 2011-05-31 19:24:26 -07:00
Friendika e25ded6d96 don't count wall posts in unseen network total 2011-05-31 17:35:24 -07:00
Friendika f95ea14478 show linked url on user's contact page 2011-05-30 22:17:04 -07:00
Friendika 9f52e311df sort wall items by date order instead of id. bug #61 2011-05-30 19:59:54 -07:00
Friendika 7fb9aa24fb bug #87 alert if email settings don't open mailbox, also display last email connect time 2011-05-29 21:20:50 -07:00
Friendika 547fd1e0e5 small fixes to item post to try and sort out segfault issues on php 5.3 (?) 2011-05-29 15:47:26 -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 94af6fb064 correct nickname for display link on comment emails 2011-05-27 18:54:43 -07:00
Friendika 763ff827d5 don't reset photo permissions unless photo has owner-only permissions 2011-05-27 02:37:12 -07:00
Friendika 341f853b04 search from network page 2011-05-26 17:47:33 -07:00
Friendika 7acb8fa6e7 add webfinger diagnostic module 2011-05-26 16:41:36 -07:00
Friendika 3710a6fd07 sort out a couple of email notify issues 2011-05-25 18:15:49 -07:00
Friendika cd536731c3 minor string update 2011-05-25 17:20:41 -07:00
Friendika b6b2997b43 remove debug line 2011-05-25 16:02:02 -07:00
Fabio Comuni ad2aded259 Small tweak to a copule of translatable strings 2011-05-25 12:23:45 +02:00
Friendika 2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika 73b4faca5c basic file upload/attach 2011-05-24 22:40:52 -07:00
Friendika e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Friendika 040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Friendika 19ccd658eb Merge branch 'pull' 2011-05-23 18:18:01 -07:00
Friendika 78b2db3a98 Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-05-23 18:17:02 -07:00
Friendika 9a3f5eaf7d Merge pull request #107 from fabrixxm/oembed 
Oembed plugin
 2011-05-23 18:12:14 -07:00
Friendika 3e6180183b improved browser language detect, set user language on login 2011-05-23 17:18:36 -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
Fabio Comuni 7c5a7a94d4 Add oembed user option for use oembed instead of standard yotube embedding. 
Remove global option and parse_url use of oembed.
 2011-05-23 10:37:09 +02:00
fabrixxm ef64c5187d add config [system][embed_all] to use oembed with links and youtube. Url parse fallback to default if url has not an oembed rappresentation. 2011-05-23 09:14:57 +02:00
Friendika 5996e2cd4c if no FB image and fb link is on our site, use Friendika logo for fb image. Otherwise it's going to end up being a random friend. 2011-05-22 21:20:28 -07:00
Friendika 576f8eda08 more buggy debugging code removed. 2011-05-22 20:18:39 -07:00
Friendika 44a22c2915 more improvements in twitter handling, reduce duplicates from FB when double friended 2011-05-22 18:40:00 -07:00
Friendika ea0a28ebfb removed buggy debug code ;) 2011-05-22 14:20:31 -07:00
Friendika 8510748b19 friendika page hook for German impressum 2011-05-22 01:15:04 -07:00
Chris Case f4cb6b9b08 fixed a couple of bugs 2011-05-21 23:19:50 -07:00
Chris Case 4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case 2cf696d0b5 image updates 2011-05-21 19:27:56 -07:00
Friendika 1ccda19f7a hooks can't contain direct values, must be variables 2011-05-21 17:17:27 -07:00
Friendika 0dfcbe9c44 better handling of twitter follows, remove ajax anchor /#!/ 2011-05-21 17:13:51 -07:00
Friendika bc2297d933 don't insert link summaries containing javascript bug #75 2011-05-21 05:27:53 -07:00
Friendika 22cf6b3fe6 'mark seen' not getting all msgs on profile page 2011-05-20 19:28:48 -07:00
Friendika db60d6d78f photo upload plugin size limit is not working, call photo_end hooks in any error return from mainline so html does not leak into json responses bug #77 2011-05-20 15:57:58 -07:00
Friendika 0abf2f11c6 patches for youtube's change in link and embed formats, please test 2011-05-20 15:46:41 -07:00
Friendika 5f20925220 deny link not clickable on admin approval notification page 2011-05-20 15:11:36 -07:00
Friendika 681885a120 "notes" app 2011-05-20 01:15:02 -07:00
Friendika a6603a54d9 don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once. 2011-05-18 20:34:18 -07:00
Friendika 990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Friendika f9444c8be5 admin directory view 2011-05-16 18:52:27 -07:00
Friendika 730322ee5f bug #70 - error messages on group deletion, warning cleanup 2011-05-15 16:36:49 -07:00
Friendika df7a4206b7 fix json_encode on url's 2011-05-12 02:15:04 -07:00
Fabio Comuni 31aee6b803 missing / in admin profile url 2011-05-12 10:33:59 +02:00
Fabio Comuni 564f9c924a Serve friendika node info as json from url /friendika/json/ 2011-05-12 10:26:34 +02: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 5eea0d5ecb photo lockview not working, temp fix for po2php 2011-05-10 20:10:13 -07:00
Friendika 2fffec912c leave extra line between imported url and content 2011-05-10 18:15:45 -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 cb6c1f91b7 rolling version number in preparation for release 2011-05-09 16:51:25 -07:00
Friendika 3b51f28d25 comment macros showing on photos 2011-05-08 22:58:38 -07:00
Friendika c2e35d2d35 set permalink on uploaded photo items 2011-05-08 22:47:35 -07:00
Friendika 26d748f6d8 Merge pull request #96 from fabrixxm/api 
Status.net Api
 2011-05-05 04:29:45 -07:00
Friendika b3fa03d3b4 Merge pull request #95 from fabrixxm/dispy 
Dispy
 2011-05-05 04:29:14 -07:00
Fabio Comuni b3a5fccc9d template for photo display 2011-05-05 10:53:03 +02:00
Friendika eb2aae7987 missing is_public in editpost 2011-05-05 00:29:56 -07:00
Friendika 5f0b43485a incorrect count of total pages in normal view mode 2011-05-04 20:49:11 -07:00
Friendika 6c1d587ae3 notify not called on new photo album (first item) 2011-05-03 05:27:19 -07:00
Friendika 0f261ef8fa configurable FB poll interval, default 1hr. 2011-05-02 20:14:37 -07:00
Friendika 69dc17eb81 when viewing network group, show my private conversations to the group 2011-04-30 21:53:51 -07:00
Friendika d45ad7bb6b suppress duplicate FB posts (incoming after posted locally) 2011-04-27 04:24:00 -07:00
Friendika 242d4805d5 call post_local_end hook on like/dislike 2011-04-26 17:07:49 -07:00
Friendika a01c40a845 no insecure warning on FB connections 2011-04-26 05:45:53 -07:00
Friendika 245a56f0c1 lots of facebook fixes 2011-04-26 04:39:27 -07:00
Friendika a0e7d8fa00 redirect to profile photo upload on very first login 2011-04-23 17:31:23 -07:00
Friendika 639d52ec18 block_public should also block the contacts page and 'Connect' page if not logged in 2011-04-21 19:12:22 -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 1d4791d38c bin2hex not vice versa 2011-04-21 00:43:37 -07:00
Friendika 6e6d143aab another typo 2011-04-21 00:29:48 -07:00
Friendika 0803abcf53 typo 2011-04-21 00:27:35 -07:00
Fabio Comuni 793fc60a65 add rsd.xml (needs a template) 2011-04-21 09:08:50 +02:00
Fabio Comuni b505e76393 First attemp of api 2011-04-21 09:04:15 +02:00
Friendika a1ef8f669d don't show connect link to authenticated visitors 2011-04-20 15:27:10 -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 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 e0e3cc7a72 edit post broke with recent checkin 2011-04-19 22:37:17 -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 29a48de5e2 follow requests most adhere to site allow policy 2011-04-19 16:31:39 -07:00
Friendika a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika b168847b56 still getting a zero 2011-04-18 16:03:07 -07:00
Friendika e2c9d04b36 leave imap port blank if 0 2011-04-18 15:58:01 -07:00
Friendika ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika 863ddf1676 mail changes 2011-04-16 08:45:08 -07:00
Friendika 13eaa802e4 relocated "follow" url scraping code so it can be used elsewhere (contact repair, etc.) 2011-04-15 00:59:00 -07:00
Friendika 44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika 54368e3a0d initial spanish translation 2011-04-14 02:34:43 -07:00
Friendika 974077c06c contact "repair/relocate URL" tool 2011-04-13 20:14:30 -07:00
Friendika 5198e039df better visibility of default post permissions 2011-04-13 17:11:24 -07:00
Friendika 17a7dae67d doco 2011-04-13 16:58:21 -07:00
Friendika 767f165965 local documentation library 2011-04-13 07:07:21 -07:00
Friendika d4bb560e7f small wording change 2011-04-12 21:37:54 -07:00
Friendika 4a514fa966 minor ui tweaks 2011-04-12 21:29:58 -07:00
Friendika 080efe4d1e missed file addition 2011-04-12 21:25:00 -07:00
Friendika e8a0dd40b2 profile visibility editor 2011-04-12 21:21:33 -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 5545c8ada9 cleanup 2011-04-12 05:37:26 -07:00
Friendika 61915a524d first cut at group chooser UI 2011-04-12 01:31:55 -07:00
Friendika 6da84027af visual display of group members 2011-04-11 22:47:16 -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 0085bf0c10 that's better... 2011-04-11 16:42:41 -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 c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -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 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 9341f2c4d6 little fix 2011-04-10 19:46:40 -07:00
Friendika 3d51518a13 set writable flag on dfrn_poll 2011-04-10 19:29:21 -07:00
Friendika 940d216395 initial dfrn update to pass perms 2011-04-10 18:38:55 -07:00
Friendika 12bc4a44cf [privacy] use owner's default permission settings on "is now friends with..." msg 2011-04-10 15:30:56 -07:00
Friendika 58508201a5 bug #37, ampersand + everything following in url is stripped when using link icon to share link 2011-04-10 03:36:12 -07:00
Friendika bf865f0210 bug #34, line breaks double in retweet/share 2011-04-10 03:00:29 -07:00
Fabio Comuni 1713ffb41c add opensearch support 2011-04-08 10:40:04 +02:00
Friendika e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika 338ba48554 more templates 2011-04-07 18:00:35 -07:00
Friendika 5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
Friendika 4043ede080 more templates 2011-04-06 23:03:54 -07:00
Friendika c32ed16303 more templates converted to string files 2011-04-06 22:42:08 -07:00
Friendika 6728a11ee3 support feed attachments/enclosures, and fix for bug #30 2011-04-06 19:42:35 -07:00
Friendika ded449f697 ostatus doesn't accept activitystreams stop-follow verb or multiple verbs, insists on single ostatus unfollow #non-standard 2011-04-05 23:06:03 -07:00
Friendika ee19746aa9 revert to regex search when < 3 chars 2011-04-05 06:27:40 -07:00
Friendika 4c5e091b78 better twitter follow support 2011-04-04 20:40:31 -07:00
Friendika 793967a1d3 better handling of troublesome feeds. 2011-04-04 19:36:18 -07:00
Friendika 742bdd3054 make photo menu work better on remote profile logins 2011-04-04 05:52:59 -07:00
Friendika 933de1769c item_photo_menu to display page 2011-04-04 02:54:09 -07:00
Friendika 94881c15d3 missed merge conflict tag 2011-04-04 01:26:04 -07:00
Friendika 379af25215 Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup 
Conflicts:
	mod/dfrn_poll.php
 2011-04-04 01:22:05 -07:00
Friendika b5bcf44354 profile not set 2011-04-04 01:18:28 -07:00
Fabio Comuni afa0d8ff70 fix profile redirect url in dfrn_poll 2011-04-04 09:50:25 +02: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
Friendika 4b356e59ec allow other destinations according to protocol 2011-04-01 14:39:09 -07:00
Friendika e33b6e0b5a redirect to symbolic rather than absolute URL locations 2011-04-01 00:59:10 -07:00
Friendika d728961cbf translateable time formats (PM & birthdays) 2011-03-31 14:46:16 -07:00
Fabio Comuni 29878d9c26 url \"/message/new/<id>\" preselect contact <id> in \"To\" select box 2011-03-31 16:54:06 +02:00
Fabio Comuni fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Friendika 75ad3219e6 remote deletion - check contact-id 2011-03-30 17:50:18 -07:00
Friendika 0fe997490d dfrn remote profile protocol revision 2011-03-30 15:04:18 -07:00
Fabio Comuni 3f94721d62 first work 2011-03-30 17:10:14 +02:00
Friendika 04cd865cc9 placeholder arg in dfrn conversations 2011-03-30 04:20:40 -07:00
Friendika f198c5cff8 secure profile failure 2011-03-30 04:07:47 -07:00
Friendika 4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika 066bdca30d optionally set article title 2011-03-29 18:57:26 -07:00
Friendika f1db34eebc more templates gone 2011-03-29 17:19:12 -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 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 76918ed5a5 info page 2011-03-27 16:35:56 -07:00
Friendika 6bc5d6f17b repair duplicate nickname accounts caused by race condition 2011-03-24 15:45:27 -07:00
Friendika 51447932f7 link same as visited 2011-03-24 01:16:14 -07:00
Friendika 85e227151b use correct mime type for json 2011-03-22 16:52:14 -07:00
Friendika e0202d82a1 add fulltext index on keywords, missed some directory localisations 2011-03-22 16:34:12 -07:00
Friendika 8f31935b7d items back in personal data download, chunked this time 2011-03-22 16:19:00 -07:00
Friendika f20464112f remove items from export - too much memory consumed, will have to stream items,photos 2011-03-22 03:25:43 -07:00
Friendika 83a36cbd13 export posts also 2011-03-22 03:20:41 -07:00
Friendika c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Friendika cd2a0802e4 horizontal match layout 2011-03-22 02:21:53 -07:00
Friendika ee11a74d0b profile match 2011-03-21 21:43:22 -07:00
Friendika c74367e4c2 pagination in keyword match 2011-03-21 21:26:11 -07:00
Friendika ee1dff9980 converted json to symbolic references 2011-03-21 19:44:00 -07:00
Friendika e16bca4f76 first prototype of profile match against global directory (hint: set some keywords) 2011-03-21 19:33:06 -07:00
Friendika f73e40c188 several install issues sorted out 2011-03-21 17:34:29 -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 5f9f03daf7 simplify insecure network warning 2011-03-20 19:29:01 -07:00
Friendika b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
fabrixxm c1144912e2 small fix 2011-03-20 08:38:42 +01:00
Friendika 7e33c1072a stuff to make connecting to diaspora profiles easier 2011-03-19 01:19:11 -07:00
Friendika 9838245c6c Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext 2011-03-18 05:07:42 -07:00
Friendika 43234a6678 rework post editing a bit 2011-03-18 05:06:16 -07:00
Fabio Comuni 7df8e18dd1 Update more strings 2011-03-18 11:02:42 +01:00
Friendika ce754bc0e2 edit to display page 2011-03-18 01:24:34 -07:00
Friendika 9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika ea03d9fa86 more thorough cleanup on account/contact removal 2011-03-17 21:15:27 -07:00
Friendika 47f0abf27e no sharing icon for private msgs 2011-03-16 22:04:00 -07:00
Friendika 9d9176f87e no sharing from thread display page 2011-03-16 21:49:28 -07:00
Friendika 334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika 8fd989c568 protect tags from double expansion during RT 2011-03-16 19:57:13 -07:00
Friendika 3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika 53dcede278 pub_keywords -> meta keywords 2011-03-14 20:19:45 -07:00
Friendika 7b92b42603 keywords split into public and private. Public will be used by the friend finder. 2011-03-14 00:28:49 -07:00
fabrixxm a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
Friendika ee210718cc photo album prev/next links 2011-03-11 20:06:13 -08:00
Friendika 5e2f0ff055 roll back "real people preferred" message - ineffectual 2011-03-11 14:48:58 -08:00
Friendika 508636082e bogus 'no results' message on search page 2011-03-10 20:46:27 -08:00
fabrixxm 9f7878057f update source strings 2011-03-11 00:22:21 +01:00
Friendika 2270e73fcd show permission denied photo when direct link was accessed and authentication is insufficient to view 2011-03-09 21:29:32 -08:00
Friendika 35c3e12df5 ability to edit image permissions 2011-03-09 21:10:16 -08: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 c248b28f92 indicate preference to register/communicate-with real people and not fictitious entities. 2011-03-08 04:06:37 -08:00
Friendika 6ff6ac4743 profile deletion issues 2011-03-08 00:39:42 -08: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 fb481e0b2f sparkle link enhancements to display page 2011-03-07 17:04:26 -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 216f038456 icon changes, feed security improvements 2011-03-04 20:55:32 -08:00
Friendika 71d4810697 photo in mail message getting bogus response 2011-03-03 20:58:39 -08:00
Friendika bfdf4bddc9 "New Item View" had no magic sparkle links 2011-03-02 16:19:38 -08:00
Friendika b8740a0a9c add manage file 2011-03-01 20:36:24 -08:00
Friendika 377f991ac5 switch identities to manage pages 2011-03-01 20:18:47 -08:00
Friendika 2d4b3bee60 qsearch_limit, not lsearch 2011-02-28 23:39:59 -08:00
Friendika 80ed4242ee singleuser site mode plus fix search template layout 2011-02-28 19:44:47 -08:00
Friendika f089b1610e feeds: update content when updated/edited changes 2011-02-28 18:24:32 -08:00
Friendika 3308a69320 increase visibility of group filter 2011-02-28 02:56:46 -08:00
Friendika 6ea77889b3 simplify connect/follow text 2011-02-27 18:11:15 -08:00
Friendika 9102fb3a6f autodiscover community pages for the directory 2011-02-27 14:17:42 -08:00
Friendika 05d3eb59ec status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower. 2011-02-26 01:53:18 -08:00
Friendika 4efa0f1e81 newline at EOF 2011-02-25 19:57:44 -08:00
Friendika 597d09de1f handle group results without parsing anything 2011-02-25 19:56:38 -08:00
Friendika ee4800a4d3 auto-complete contact/group endpoint 2011-02-25 15:28:07 -08:00
Friendika c3cb3d75e5 use consistent tagging patterns with relationship partner 2011-02-25 12:12:25 -08:00
Friendika 1207bb1b55 silence parse_url on hostile input, need to get_app() for proc_run php location 2011-02-24 15:41:15 -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 755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika fdc469ae4c move directory registration block before redirect 2011-02-23 14:04:00 -08:00
Friendika 365ff94137 push directory on register - if permitted 2011-02-23 01:37:15 -08:00
Friendika f57f9852b1 pulled strings from one more template 2011-02-22 15:35:33 -08:00
Friendika 5f2f644064 resolve file inclusion conflicts w/ multiple plugins, improve the typo checker 2011-02-21 20:19:33 -08:00
Friendika c10879efdd default publish to directory, but offer registration privacy setting. 
generalise publish option template - so once translated we can merge them all.
Update strings.
 2011-02-21 16:50:06 -08:00
Friendika 079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika 0a7b3c111e convert html entities on conversational emails 2011-02-21 00:20:55 -08:00
Friendika af0fe4cf42 Merge branch 'chriscase-master' 
Conflicts:
	mod/dfrn_notify.php
 2011-02-20 01:42:11 -08:00
Chris Case 9260bb4ce1 updated private message code to use the new EmailNotification library 2011-02-19 05:35:01 -08:00
Friendika 3d1b153dec apps menu file 2011-02-19 01:01:33 -08:00
Friendika 0bf8e418a8 Merge branch 'chriscase-master' 
Conflicts:
	mod/dfrn_notify.php
 2011-02-17 14:05:51 -08:00
Chris Case 9e654f7e57 removed localized multipart email templates, now the multipart settings are configured directly in the code 2011-02-17 13:41:56 -08:00
Fabio Comuni 3d69e2a50c Merge branch 'master' into themetests 2011-02-17 14:14:06 +01:00
Friendika 979307ef91 ajax testing continues 2011-02-17 00:52:26 -08:00