clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,816 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1724 Commits

Author SHA1 Message Date
friendica 1cd23860cb rev update 2012-08-11 15:39:45 -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
friendica ed7e626ed2 Merge https://github.com/friendica/friendica into pull 2012-08-10 16:04:16 -07:00
friendica b960352b54 rev update 2012-08-10 16:02:20 -07:00
Zach Prezkuta d9279da369 - Frost Mobile: redo CSS to adjust automatically to the screen width 
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
 2012-08-10 08:34:00 -06:00
friendica ba9c50c0dd rev update 2012-08-09 15:32:07 -07:00
friendica 101df5145e rev update 2012-08-08 17:06:54 -07: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
friendica bc5b54d7b7 Merge https://github.com/friendica/friendica into pull 2012-08-04 17:03:32 -07:00
friendica bf19e62ecd rev update 2012-08-04 17:02:05 -07: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 621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
friendica 864b5fc256 rev update 2012-08-02 14:15:56 -07:00
friendica 4cbde6a75d rev update 2012-08-02 01:23:16 -07:00
friendica 49ad9b355c rev update 2012-07-31 18:01:55 -07:00
friendica 27ee8620f9 rev update 2012-07-30 14:14:20 -07:00
friendica 299f9e3d9e rev update 2012-07-29 15:32:26 -07:00
friendica 5e64bccd5c don't show birthday/event details on mobile devices 2012-07-28 17:48:33 -07:00
friendica fe19890c3c Merge https://github.com/friendica/friendica into pull 2012-07-28 16:13:25 -07:00
friendica 61115d7a07 rev update 2012-07-28 16:12:12 -07: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
friendica 50e20a1494 rev update 2012-07-27 17:52:43 -07:00
Fabrixxm a77fdfa6aa remove special case for /.well-known/host-meta and add module for /.well-known 2012-07-27 08:58:27 -04:00
friendica b9f13400d9 rev update 2012-07-25 15:52:26 -07:00
friendica 00043f3f1e Merge https://github.com/friendica/friendica into pull 2012-07-24 17:25:36 -07:00
friendica f48e491ba0 rev update 2012-07-24 17:24:53 -07:00
Zach Prezkuta 657347254f use regular theme choosing logic if no mobile theme is specified 2012-07-24 18:13:19 -06: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
Zach Prezkuta 5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica dbdcbaa7ef Merge https://github.com/friendica/friendica into pull 2012-07-23 16:51:02 -07:00
Domovoy c052c6afca Database can now be automatically updated 2012-07-24 01:21:02 +02:00
friendica 0d631cc08c hopefully better update handling - never update the current DB version or continue with other updates if there was a failure of any individual update. 2012-07-23 15:57:40 -07:00
friendica b20a80bf39 rev update 2012-07-23 15:27:25 -07:00
friendica cdf67ce725 rev update 2012-07-22 15:39:25 -07:00
friendica 5255a5c9a9 rev update 2012-07-21 16:44:15 -07:00
friendica 8c83828f83 rev update 2012-07-20 15:12:21 -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
friendica b6a3471608 rev update 2012-07-19 15:27:22 -07:00
friendica ac47edb775 rev update 2012-07-18 16:28:19 -07:00
friendica 749ae9b297 filter the protocol specifier in bbcode links. 2012-07-17 18:33:04 -07:00
friendica e477683987 rev update 2012-07-16 17:03:23 -07:00
friendica 3408a56dd3 rev update 2012-07-15 14:22:45 -07:00
friendica c87d3cb86f rev update 2012-07-14 14:16:24 -07:00
friendica bbb022f564 rev update 2012-07-13 13:52:23 -07:00
friendica ce5ca967c1 rev update 2012-07-12 16:11:43 -07:00
friendica 9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
friendica 24ea480276 rev update 2012-07-11 17:55:39 -07:00
friendica 12255dded5 rev update 2012-07-10 18:05:13 -07:00
friendica 1fda9e9365 rev update 2012-07-10 01:06:11 -07:00
friendica caabb43326 diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match. 2012-07-08 22:32:04 -07:00
friendica e94f7ed23d rev update 2012-07-07 16:20:34 -07:00
friendica d7920c4c25 term (tag, mention, category, file, etc.) table 2012-07-05 17:59:56 -07:00
friendica 8af78079cb Merge https://github.com/friendica/friendica into pull 2012-07-05 16:06:43 -07:00
friendica 9951071b5b rev update 2012-07-05 16:06:01 -07:00
Zach Prezkuta 2edfc3b539 final db updates after testing 2012-07-05 14:31:19 -06:00
friendica 5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
friendica b550b1326b Merge https://github.com/friendica/friendica into pull 2012-07-03 16:26:58 -07:00
friendica 7926a0d171 add link to shares 2012-07-03 16:26:14 -07:00
Zach Prezkuta 3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures 2012-07-02 20:01:23 -06:00
friendica ced0a208d8 fix double lines 2012-07-02 16:34:01 -07:00
friendica ab2b3304dc ...and the other bit 2012-07-01 19:40:03 -07:00
friendica e2a725ff98 pagination start off by one 2012-07-01 19:17:21 -07:00
friendica dd71f9446b config to disable email validation 2012-07-01 18:56:00 -07:00
friendica 7747f6fc96 rev update 2012-06-30 17:38:02 -07:00
friendica a3dfb55029 bug #437 2012-06-30 06:27:46 -07:00
friendica 78e03abed8 convert ent_quotes for jquery calendar title/summary 2012-06-29 20:11:36 -07:00
friendica 7b63e5792a more pager limits 2012-06-28 21:39:02 -07:00
friendica de93c61e0d remove titles in ostatus even when edited date differs from created date 2012-06-28 16:04:00 -07:00
friendica eb3bbd9081 insidious little parsing bug 2012-06-26 22:32:07 -07:00
friendica b02c733967 service class restrict the email connector 2012-06-26 18:30:20 -07:00
friendica fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
friendica eebb2d2120 rev update 2012-06-25 15:34:23 -07:00
friendica c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
friendica 9528beac34 sidebar photo album list not visible to anybody if user['hidewall'] set 2012-06-24 16:51:39 -07:00
friendica 7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
friendica 1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
friendica 181a17bd05 share RSS items 2012-06-22 15:27:06 -07:00
friendica eeceecc9ba unterminated sql string 2012-06-22 00:25:01 -07:00
friendica 0f0e5be549 contact search oddities 2012-06-20 16:05:46 -07:00
friendica 1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -07:00
friendica 01aa953951 rework fallback themes, glob pattern was wrong 2012-06-19 16:22:38 -07:00
Zvi ben Yaakov (a.k.a rdc) 4977ef4142 Added App::get_cached_avater_image usage in profile_sidebar function for creating the $diaspora array that is used to populate diaspora_vcard.tpl. This allows the correct profile image revision to be used when dfrn_request friend requests are made. 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) 9058029eef Added get_cached_avatar_image to App class for shared profile image access and reduced sql queries/load 2012-06-19 16:05:37 -07:00
friendica 9c844e3bbe rev update 2012-06-19 16:04:20 -07:00
friendica 341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
friendica b385729c17 rev update 2012-06-17 16:00:47 -07:00
friendica 7c2d27e275 rev update 2012-06-16 17:29:42 -07:00
friendica 4faf0e609f rev update 2012-06-16 03:35:45 -07:00
friendica 8c94fa23bf Merge https://github.com/friendica/friendica into pull 2012-06-14 17:39:17 -07:00
friendica be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
fabrixxm f66ae301b8 network: fix bug #453 2012-06-14 10:04:13 -04:00
friendica d908c9dd71 disable archive widget for PHP < 5.3 2012-06-13 16:17:45 -07:00
friendica 832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica 30295926b9 make sure default timezone is set in external processes 2012-06-11 19:52:46 -07:00
friendica 24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica 09f74be14c variable confusion in poller, don't allow negative page offsets 2012-06-11 17:24:16 -07:00
friendica 3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
friendica 4f9fb37925 rev update 2012-06-10 16:31:00 -07:00
friendica ff8d159698 rev update 2012-06-10 00:59:36 -07:00
friendica 67d8afb9d1 Merge https://github.com/friendica/friendica into pull 2012-06-07 15:48:04 -07:00
friendica c4aeb57fcd rev update 2012-06-07 15:46:07 -07:00
Fabio Comuni 7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
friendica dd001e32f4 rev update 2012-06-06 16:02:10 -07:00
friendica 7cc7a14380 rev update 2012-06-05 17:59:12 -07:00
friendica 9f4b897261 Merge https://github.com/friendica/friendica into pull 2012-06-03 14:48:28 -07:00
friendica 0b657aa235 rev update 2012-06-03 14:47:53 -07:00
Zach Prezkuta 2a01ae8149 database updates 2012-06-03 14:53:30 -06:00
friendica d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica 4978ee12d1 webfinger profile linker 2012-06-02 18:05:23 -07:00
friendica 608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica 0165d5dd2c registration issue after re-factor 2012-06-01 15:42:13 -07:00
friendica 93bc29a711 turn registration code into a standalone function for re-use 2012-05-31 19:06:17 -07:00
friendica 069361f946 rev update 2012-05-30 15:50:30 -07:00
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica 419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
friendica f033c9a4ae rev update 2012-05-28 16:51:52 -07:00
friendica 2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica 5a7363b248 more ssl policy stuff 2012-05-26 16:21:48 -07:00
friendica 73c61b6f96 allow force ssl on notifications 2012-05-26 16:11:51 -07:00
friendica fafd41f4bf keep private FB stuff out of personal notes 2012-05-25 14:36:17 -07:00
friendica abb9fecf09 rev update 2012-05-25 00:42:38 -07:00
friendica 6bcfda6d53 rev update 2012-05-23 15:46:04 -07:00
friendica e70573f34c if identity (uid) changes - reload any other open browser windows on next ping. 2012-05-22 16:01:07 -07:00
friendica 54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
friendica afaf9ec74f rev update 2012-05-20 18:30:02 -07:00
friendica dd86f40f96 set comment permissions explicitly to parent permissions 2012-05-19 16:42:24 -07:00
friendica 4133df6223 profile change activity link bug 2012-05-18 17:55:11 -07:00
friendica 7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica d5d853f37f setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
friendica 6744b5975c rev update 2012-05-16 13:52:11 -07:00
friendica 205c09e4f0 rev update 2012-05-15 17:05:28 -07:00
friendica 2b471d6df3 rev update 2012-05-14 16:32:21 -07:00
friendica 2bd4ff5705 rev update 2012-05-13 16:40:02 -07:00
friendica e7813f22af slackr drop shadows 2012-05-12 22:19:29 -07:00
friendica aa83198611 rev update 2012-05-12 01:27:33 -07:00
friendica 496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
friendica 8600afafe2 rev update 2012-05-10 18:50:11 -07:00
friendica 4a42414135 rev update 2012-05-09 18:15:27 -07:00
friendica 8be8db39de rev update 2012-05-09 17:56:05 -07:00
friendica 70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00
friendica 10812e0c19 make it optional to optimize the item table after expire 2012-05-08 15:33:01 -07:00
friendica 189a31e628 If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue 
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.
 2012-05-07 15:54:49 -07:00
friendica 8e46c43ee1 rev update 2012-05-06 19:52:22 -07:00
friendica 49ccefd6c7 bad sql left after the mailbox in/out merge 2012-05-05 17:53:23 -07:00
friendica 7c6e8b30b2 only show remove category to item owner 2012-05-04 16:45:10 -07:00
friendica f3e18df55d string update 2012-05-03 16:55:03 -07:00
friendica 3be9cddfd7 rev update 2012-05-02 15:26:57 -07:00
friendica dc31b93941 provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. 2012-05-02 01:45:57 -07:00
friendica dd27328390 perform basic validation 2012-05-01 23:15:39 -07:00
friendica 38ccd2e655 convert html entities to utf-8 before email header encoding 2012-05-01 15:49:22 -07:00
friendica 584ac68ae4 adding zrl support to social graphs 2012-05-01 01:16:47 -07:00
friendica d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
friendica 88c77083e6 rev update 2012-04-30 17:17:19 -07:00
friendica 05df5337dd start adding tooltips to tab menus 2012-04-30 05:15:29 -07:00
friendica 0639f645d2 activitystreams schema constants for "join group" 2012-04-29 23:15:12 -07:00
friendica 0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
friendica e3fecb2557 improved db error logging 2012-04-29 17:34:54 -07:00
friendica 249a6814cd add db field for removed account, which will also be the first test of update error checking 2012-04-29 01:08:28 -07:00
friendica b3a71e4327 indicate successful updates 2012-04-28 21:35:14 -07:00
friendica 356bd9b04a some constants for the db update failure possibilities 2012-04-28 17:53:19 -07:00
friendica 7919d00399 bring back the email and logging of update failures, but without the transactions 2012-04-28 17:50:28 -07:00
friendica 4ff2e9a103 a few more continues that should be returns 2012-04-28 16:54:33 -07:00
friendica 0ab6b60a52 archive contact flag 2012-04-27 16:46:28 -07:00
friendica c7cbff6fbb rev update 2012-04-27 15:55:56 -07:00
friendica f8e7f28f40 rev update 2012-04-26 15:35:00 -07:00
friendica 78579627ce rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
friendica 139c2c1bbd Merge https://github.com/friendica/friendica into pull 2012-04-24 17:55:56 -07:00
friendica a5f9e67c9f rev update 2012-04-24 17:55:35 -07:00
Fabio Comuni 62ad5043d6 remove html from get_birthdays() and get_events() 2012-04-24 09:50:10 +02:00
Fabio Comuni fc61616c53 events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) 2012-04-24 08:12:30 +02:00
friendica f265863435 more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips 2012-04-23 18:28:33 -07:00
friendica 00cb7f9efb don't allow non-existent themes as choices 2012-04-22 16:24:29 -07:00
friendica 371f3e450e rev update 2012-04-21 19:28:45 -07:00
friendica bdbe068b95 rev update 2012-04-21 01:18:46 -07:00
friendica 30bbbf32e5 rev update 2012-04-20 06:31:38 -07:00
friendica 7ebca2b37d rev update 2012-04-16 22:58:52 -07:00
friendica 37bb3c330d rev update 2012-04-15 16:21:20 -07:00
friendica 0939029b74 track requested profile error msg 2012-04-14 14:45:09 -07:00
friendica 0d869ceb65 pass zrl's to/through global directory 2012-04-14 03:51:41 -07:00
friendica dfe774179a rev update 2012-04-13 14:44:37 -07:00
friendica 972c01edb3 profile change activities 2012-04-12 21:10:32 -07:00
friendica 2b01d2b6e0 rev update 2012-04-12 16:12:51 -07:00
friendica 7eb1fbb41f turn off update transactions until we figure out how to do them safely. 2012-04-12 05:45:28 -07:00
friendica 8a8702c9cd extensible item_id table for managing all the different message-ids generated by multiple services 2012-04-11 16:13:57 -07:00
friendica 35b978bb1e rev update 2012-04-10 15:25:15 -07:00
friendica 9a8c69b024 Merge branch 'pull' 2012-04-09 16:55:06 -07:00
friendica 2072fabc78 rev update 2012-04-09 16:54:39 -07:00
Alexander Kampmann 018727aa15 source beautifarming to make review easier 2012-04-09 16:56:01 +02:00
Alexander Kampmann 1370ba5d16 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00
Alexander Kampmann 7187516718 fixed some typos 2012-04-09 14:27:52 +02:00
Alexander Kampmann 7ac4b83c39 made exceptions from the db optional 
set address for updae mails correctly
 2012-04-09 14:04:49 +02:00
friendica 977625a53b fix to wall_upload photos default permissions to use cid rather than uid. 2012-04-08 16:19:45 -07:00
Alexander Kampmann 0d60dbef31 added exceptions to dba class 
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines. 
added admin email on failed updates

added german translation for admin email
 2012-04-09 00:45:10 +02:00
friendica 741a5dba57 provide theme_init() functions 2012-04-08 05:52:00 -07:00
friendica 3afc9915e3 rev updates 2012-04-08 05:24:11 -07:00
friendica 3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
friendica 13dfb40128 fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -07:00
friendica 0731c177eb fix bad sql update 2012-04-06 03:25:01 -07:00
friendica 4bee1859be Merge branch 'pull' 2012-04-05 21:43:38 -07:00
friendica 053048af10 rev update 2012-04-05 14:37:30 -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
Alexander Kampmann cbf4544887 added index to config and pconfig table 
changed config.php to use REPLACE instead of INSERT, 
this removes one db hit.
 2012-04-05 13:27:09 +02:00
friendica 62c60fd53d bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 2012-04-04 14:13:34 -07:00
friendica 3db2cf76b9 remove loozah themes which fell too far behind to recover 2012-04-03 16:40:25 -07:00
friendica 9391fc965d bug #363 and a couple of other reported ssl link issues 2012-04-02 17:43:11 -07:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica 00bbb9ad36 slight improvement in handling of plaintext feeds 2012-04-01 15:43:57 -07:00
friendica 5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica 2147e0a71f ensure all new users get a timezone. We'll use UTC until they choose otherwise. 2012-03-31 16:08:40 -07:00
friendica 0cf2e051bb escape % in file_tag_query as it is ultimately embedded in a sprintf 2012-03-31 14:48:35 -07:00
friendica b4b1055b50 settings for unknown private mail acceptance 2012-03-31 00:57:59 -07:00
friendica aace55df0a Merge branch 'pull' 2012-03-30 15:12:20 -07:00
friendica cfdfcb37cb don't delete contact from a friend request if friendship was already established 2012-03-30 15:10:50 -07:00
Fabio Comuni 01af7d355a allow themes to use "style.php" instead of "style.css". 
Load style.php trhu mod/view.php to pass it friendica framework.
 2012-03-30 21:18:25 +02:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica 5921dc6f16 typo in function name 2012-03-29 16:01:44 -07:00
friendica 60fe74ce97 network permission ids 2012-03-28 19:56:14 -07:00
friendica 4fe0b56d76 bug #349 - email notls setting 2012-03-28 14:54:00 -07:00
Fabio Comuni 767245e9ff viewsrc: return only body if page is requested via ajax 2012-03-28 11:42:04 +02:00
friendica 0aa99acd35 profile_tabs hook 2012-03-27 20:15:15 -07:00
friendica aba63f8b78 turn on gecko spellcheck in tinymce 2012-03-27 15:20:36 -07:00
friendica 7a1d044b21 revup 2012-03-26 14:54:30 -07:00
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
friendica 5bb7303408 NOTIFY_SYSTEM 2012-03-25 04:37:09 -07:00
friendica 3ae43c2448 prevent duplicate friend suggestions 2012-03-24 15:53:53 -07:00
friendica db5ec58863 network filter is now a permission group 2012-03-24 01:33:50 -07:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
Alexander Kampmann 43f672877f removed some new lines to cut down number of changed files 2012-03-22 13:03:28 +01:00
Alexander Kampmann cea7ca1df4 Merge branch 'master' of git://github.com/friendica/friendica 
Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php
 2012-03-22 12:50:02 +01:00
friendica ebdf0ee99e prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms 2012-03-22 01:46:52 -07:00
friendica 89028f2e2f add comix-plain 2012-03-21 13:55:37 -07:00
friendica 92ef36ad61 slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible 2012-03-20 14:55:18 -07:00
friendica 9e133d6412 refactor openid logins/registrations 2012-03-19 15:03:09 -07:00
friendica 139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
friendica 37f4cbd732 revup 2012-03-18 17:57:29 -07:00
friendica 67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
friendica 26258bca77 compare ssl_policy precisely in case somebody was bitten by template processor bug 2012-03-17 02:36:59 -07:00
friendica 511d8a30a0 scheme checking for webservers without $_SERVER['HTTPS'] 2012-03-16 23:51:49 -07:00
friendica 58940175e1 wrong link in d* comment notifications 2012-03-16 15:07:45 -07:00
friendica 7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
Alexander Kampmann 9796e99fa8 added simple build-in profiling 2012-03-15 11:45:06 +01:00
friendica b44533e9fb roll protocol version due to ssl_policy settings 2012-03-14 21:40:36 -07:00
friendica 93a8907f43 force login to ssl on SSL_POLICY_SELFSIGN 2012-03-14 21:29:44 -07:00
friendica f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica 64e3e3590b revup 2012-03-14 16:09:13 -07:00
friendica 427362c324 Merge branch 'pull' 2012-03-13 15:41:13 -07:00
friendica dc84da520d invite potential connectees to the free social web 2012-03-13 15:40:16 -07:00
friendica acc4bbeb6e Merge pull request #129 from CatoTH/master 
CSRF-Protection and minor changes
 2012-03-13 14:36:52 -07:00
friendica acf75e85c8 revup 2012-03-12 19:12:00 -07:00
Tobias Hößl 9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
friendica d9bee73edf community meta tag renamed from "ika" 2012-03-11 15:50:23 -07:00
Tobias Hößl 4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica 20d1a16dbb revup 2012-03-10 14:44:43 -08:00
friendica 92a93642e1 revup 2012-03-09 14:43:48 -08:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica 3cfa83c3db revup 2012-03-08 14:34:58 -08:00
friendica dd3b3c2454 revup 2012-03-07 15:54:37 -08:00
friendica 731b19c025 revup 2012-03-06 13:57:38 -08:00
friendica c6dce8dd6b revup 2012-03-05 13:37:32 -08:00
friendica cd5a11bb0f revup 2012-03-04 13:39:17 -08:00
friendica 20d37f2e3e revup 2012-03-04 02:25:32 -08:00
friendica a66648356f add diabook to default themes 2012-03-02 16:24:26 -08:00
friendica be231e3466 item table update for file feature 2012-03-02 00:09:10 -08:00
friendica 58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
friendica bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica 84d5f495e6 better handling of multiple notifications for same item, and old notifications 2012-02-29 16:26:07 -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 3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
Tobias Hößl 36a1a43f06 Avoid notices 2012-02-28 13:42:12 +00:00
friendica 53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
friendica d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
Tobias Hößl 7c30fca981 Avoid a Notice 2012-02-27 22:17:57 +00:00
friendica fc036210fb spam db 2012-02-26 18:53:48 -08:00
friendica 89560edde2 Merge pull request #50 from annando/master 
massive changes in mail and design updates in "vier"
 2012-02-26 15:07:34 -08:00
Michael fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
friendica bdb14d5aad relative link redirects 2012-02-26 14:34:01 -08:00
Abinoam P. Marques Jr da52792d06 DB_UPDATE_VERSION incremented 2012-02-25 16:59:44 -08:00
friendica 579738aff7 fixed link for toggling plugin from detail page 2012-02-25 13:00:44 -08:00
friendica a3cf563b68 update author name across items if changed. 2012-02-24 20:40:09 -08:00
friendica b95e3ac496 more privacy docs 2012-02-24 12:52:50 -08:00
friendica 44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
friendica b4d38f6eed implement firehose notify in ping, strip links so notify popup displays correctly in all themes 2012-02-23 16:50:29 -08:00
friendica 58a9c652de Merge pull request #45 from annando/master 
New HTML to BBCode converter, changes to BBCode, nginx support, ...
 2012-02-22 20:21:05 -08:00
friendica f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
friendica a97cb88b65 logger_debug was used as string instead of constant 2012-02-21 14:15:10 -08:00
friendica b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
friendica 4fbd93f7e7 revup 2012-02-20 13:29:46 -08:00
Michael 0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
friendica 2fe479034c revup 2012-02-19 14:37:01 -08:00
friendica 346b44fbf6 revup 2012-02-17 10:13:06 -08:00
friendica 7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
friendica 18b307f983 revup 2012-02-15 14:12:35 -08:00
friendica 7697bde0ca revup 2012-02-14 13:56:43 -08:00
friendica c87aa8f927 poll structures 2012-02-13 18:02:43 -08:00
friendica dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00
friendica 330a876d81 bug #281 2012-02-12 14:18:32 -08:00
friendica 0c4606682f fix link/bookmark reshares 2012-02-11 19:21:41 -08:00
friendica 75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
friendica d79c3351ea db installation sync 2012-02-10 13:43:35 -08:00
friendica 171249966e add tag notifications to enotify 2012-02-09 14:06:17 -08:00
friendica b0ee8dd409 begin cmin, cmax 2012-02-08 17:56:23 -08:00
friendica 8a3c1f7930 beer smilie 2012-02-07 15:41:06 -08:00
friendica 76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden 2012-02-06 16:41:05 -08:00
friendica b12e598dba roll update 1118 forward, enable update 1119 2012-02-05 14:30:24 -08:00
friendica 4cf6bd5469 do an optimise after an expunge 2012-02-02 18:02:08 -08:00
friendica 9fc36d3da4 improvements in d* markdown conversion 2012-02-01 17:09:53 -08:00
friendica c0c0f2dc15 add closeness attribute 2012-01-31 23:54:53 -08:00
friendica 86c0eac27d transport for email contacts phase II 2012-01-31 20:03:46 -08:00
friendica 4fc455d195 revup 2012-01-31 15:50:49 -08:00
friendica c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica 61246cbd1c some zot-id infrastructure 2012-01-29 15:47:25 -08:00
friendica d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica 5161be67e9 logging of manage identities 2012-01-27 12:56:36 -08:00
friendica 1bec801523 typo in update - critical 2012-01-26 23:56:47 -08:00
friendica 167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica d2a9341128 new event current date off by one, submit button misplaced 2012-01-25 13:42:06 -08:00
friendica 3a1a4d62d9 bug #254 2012-01-24 16:23:30 -08:00
friendica a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica 9f0a836674 revup 2012-01-22 13:31:59 -08:00
friendica b5ec475906 bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC 2012-01-21 14:07:28 -08:00
friendica 43102e940a revup 2012-01-20 13:50:02 -08:00
friendica 7a11a6f09b revup 2012-01-19 17:18:58 -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 2cc02716e1 revup 2012-01-16 20:18:20 -08:00
friendica e12341b716 api post broken with recent change to use REQUEST vars in mod_item 2012-01-15 13:57:00 -08:00
friendica 87c4d1c3cd bug #251 - privacy settings not working via API 2012-01-12 13:58:17 -08:00
friendica dcc22ab5c5 improve direct login on network page 2012-01-11 13:38:03 -08:00
friendica cf7008e575 post preview to loozah 2012-01-10 17:47:11 -08:00
friendica a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica 96031d0e95 show connect link even on restricted profiles 2012-01-08 13:39:41 -08:00
friendica 358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -08:00
friendica 5b809328af send diaspora share notification back to originator for auto friending 2012-01-05 13:25:43 -08:00
friendica c1cf6e48c2 Allow Diaspora to post to forums 2012-01-04 13:50:12 -08:00
friendica fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -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
friendica 3f2a492ce7 revup 2012-01-02 13:59:50 -08:00
friendica d52f833c5f extensible notify structure 2012-01-01 22:44:03 -08:00
friendica 0afb636e46 change default ostatus poll interval 2012-01-01 11:45:56 -08:00
friendica 44b4baa0ca notification data type 2012-01-01 00:39:22 -08:00
friendica 3e162bcf8f function not defined 2011-12-30 20:48:49 -08:00
friendica a76be1934a migrate more notifications 2011-12-29 22:32:30 -08:00
friendica c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
friendica 0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica 5c7df6e964 notify_intro 2011-12-26 15:47:40 -08:00
friendica 356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica 205dcd8f5b Merge branch 'master' into notify 2011-12-25 19:14:45 -08:00
friendica 4a28832e2d revup 2011-12-25 16:05:25 -08:00
friendica 6f4f3e6929 revup 2011-12-24 22:13:44 -08:00
friendica 202725e671 Merge branch 'master' into notify 2011-12-23 22:40:04 -08:00
friendica fc90323cd2 revup 2011-12-23 22:39:43 -08:00
friendica 95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
friendica b602203e6c revup 2011-12-22 15:41:33 -08:00
friendica dacbbfaafb bug #188 diaspora_signed_retraction not removing post 2011-12-21 14:42:12 -08:00
friendica 7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
friendica 63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica 7c6bc5a93d invalid thread-id in "nouveau" mode of conversation, bug 245 2011-12-19 13:51:55 -08:00
friendica 622886a33c make mod-follow "get"-able 2011-12-18 12:41:46 -08:00
friendica e6b538c046 add webfinger addr to gcontact for friend "connect" links 2011-12-18 00:50:17 -08:00
friendica 978717a247 add webfinger to poco, if present 2011-12-18 00:14:34 -08:00
friendica 690b3f57b7 bug 241 - valid emails may contain + on lhs 2011-12-16 14:06:50 -08:00
friendica cc5fd0a136 revup 2011-12-15 12:50:34 -08:00
friendica 431a4abd25 name change stragglers, fix newmember links, liveupdate glitch 2011-12-14 14:17:48 -08:00
friendica 4f2d516920 liveupdate: only modify existing conversations if not page1 2011-12-13 15:21:11 -08:00
friendica ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica e74a960327 change default ajax interval to 40 seconds 2011-12-12 17:10:19 -08:00
friendica b10e20c599 revup 2011-12-12 13:41:51 -08:00
friendica 4f254ffb5b system support for personal configurable ajax update interval 2011-12-11 20:32:43 -08:00
friendica 50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica 834639ebab \o/ smiley 2011-12-11 16:58:36 -08:00
friendica 727661d454 revup 2011-12-09 16:48:15 -08:00
friendica 3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica 7eba8adbf7 pm replies 2011-12-06 19:15:42 -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 be8e9d3616 d* pm 2011-12-06 00:16:13 -08:00
friendica adbc84c48e maintain backward compatibility with old PMs 2011-12-05 14:06:41 -08:00
friendica c8d5274cee data structures to support hidden friends 2011-12-05 02:16:59 -08:00
friendica 6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
friendica 8a489b4762 unix style homedir 2011-12-04 03:01:04 -08:00
friendica acd28bb1ef add a bookmark index, needed by network queries 2011-12-03 13:53:49 -08:00
friendica 172fdbcdcf bug #232 2011-12-03 00:08:04 -08:00
friendica ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica 37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica 7b9ba3bb03 personal tab on network page 2011-11-29 14:35:20 -08:00
friendica f4e1135f79 poco addition to provide a "suggestme" for new members 2011-11-28 15:11:59 -08:00
friendica ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica 1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica 0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica 8aae7f047d comments collapsing on page update 2011-11-24 13:54:21 -08:00
friendica b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica 7a259d4acb ensure comment counts update after refactor of collapsed comments 2011-11-23 14:03:53 -08:00
friendica 53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
friendica c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
friendica 44dcef2948 revup 2011-11-19 13:37:10 -08:00
friendica d53db63d41 forum split delivery flag 2011-11-18 21:55:00 -08:00
friendica fa4742e6ee comment boxes not work in alternate languages 2011-11-17 15:42:56 -08:00
friendica ede25aabce check all attribute names for validity 2011-11-16 14:23:06 -08:00
friendica 7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
friendica 6726d406f0 revup - change connector config link in doc 2011-11-15 12:01:21 -08:00
friendica d23452db2b revup 2011-11-14 19:15:03 -08:00
friendica ce7a3615b5 d* - remove dupe bbcode code tags 2011-11-13 19:04:59 -08:00
friendica bbf857ba39 add revision date to main profile photo to overcome cache when updated, other photos (e.g. conversations) must wait for cache update 2011-11-12 17:50:14 -08:00
friendica 02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -08:00
Friendika c9014a111f html5 parser - numeric attribute names chucking a wobbly. 2011-11-11 14:21:52 -08:00
Friendika c66b886d7e shared tags for testbubble, prevent tag hijacking of shared tag activities 2011-11-10 17:11:55 -08:00
Friendika 7fd54ad51f revup 2011-11-09 16:37:33 -08:00
Friendika dbf9711e91 reset theme_info when a profile is loaded (without a theme cookie the default nav template over-rides the nav template for the theme that is loaded afterward) 2011-11-09 01:54:52 -08:00
Friendika 6d507a840a some doc updates 2011-11-08 14:12:01 -08:00
Fabio Comuni d7d889bcd0 oauth: db update 2011-11-07 17:48:14 +01:00
Fabio Comuni 00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni 9b1a498061 allow hidden fields in login form 2011-11-07 17:34:29 +01:00
Fabio Comuni a1a07e7287 Add missing $nav_sel in class App 2011-11-07 10:17:44 +01:00
Friendika 327105a4ea try and fix diaspora multiple items queued issue 2011-11-06 16:48:13 -08:00
Friendika f07c0b2cfb implement signed_retractions 2011-11-05 14:45:29 -07:00
Friendika a203820efe reduce polling load 2011-11-04 15:21:46 -07:00
Friendika 014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika 4f4b03367a plugin check returning 0 vs false 2011-11-03 15:14:33 -07:00
Friendika a9ec56ace1 prevent duplicate @ tags 2011-11-02 18:52:55 -07:00
Friendika 8582701b70 raise backtrack (pcre) limit 2011-11-02 01:50:15 -07:00
Friendika 573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika ae7425dadb don't send diaspora profile updates in batch mode 2011-11-01 14:24:56 -07: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 d5ce13ee12 bug #186 - $type macro not replaced in diaspora 'like' message 2011-10-31 14:30:27 -07:00
Friendika c00aacf9e5 rename 2011-10-30 15:12:07 -07:00
Friendika b025981858 yet more diaspora images to scale 2011-10-28 16:13:54 -07:00
Friendika 056fe0a3aa poco discovery 2011-10-27 14:52:35 -07:00
Friendika 2f3e39ba15 edit profile quick link 2011-10-26 16:57:25 -07:00
Friendika 2d22a58324 @ tag completion enhancements, show url on hover and respect custom attags 2011-10-26 15:14:12 -07:00
Friendika 9f5d7b254b revup 2011-10-26 12:50:11 -07:00
Friendika 52038c6b88 event notification stuff 2011-10-25 15:36:49 -07:00
Friendika 1d325f6e76 change event display order 2011-10-25 00:38:43 -07:00
Friendika 323a7e4c9c need a lower bound for events 2011-10-25 00:36:23 -07:00
Friendika 0b55a7a703 only notify for events that are starting soon - ignore long-running events that are in progress 2011-10-25 00:32:28 -07:00
Friendika 4ea6f86b20 bug #166 2011-10-24 22:07:42 -07:00
Friendika 4218e3f494 Merge branch 'pull' 2011-10-24 15:51:14 -07:00
Friendika ea9d3b06f6 Merge pull request #35 from fabrixxm/master 
Use oembed if possible without the addon

Awesome!
 2011-10-24 15:49:28 -07:00
Friendika 3b6b0eaa8b social tag - add UI 2011-10-24 15:47:17 -07:00
Fabio Comuni 306036c626 cache api 2011-10-24 13:02:38 +02:00
Friendika 6eea312c21 workaround for transmitting photos to D* 2011-10-23 16:01:04 -07:00
Friendika b6f80e8ee7 revup 2011-10-23 00:25:45 -07:00
Friendika 0ada550a02 queue indexes 2011-10-22 01:29:26 -07:00
Friendika 1a78416631 revup 2011-10-21 12:58:16 -07:00
Friendika bef7a5d66b bug #183 - strlen borking on sysmsg, which is now an array 2011-10-20 14:55:40 -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 b14914ee2e fix tb tabs 2011-10-18 13:07:27 -07:00
Friendika 06096486d4 hopefully solve db update issues bug #182 2011-10-18 00:18:21 -07:00
Friendika f0dc77ab6c Merge branch 'pull' 2011-10-17 14:55:46 -07:00
Friendika 278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Fabio Comuni de44072172 works on login form 2011-10-17 16:53:59 +02:00
Friendika b820dfa31f revup 2011-10-16 01:46:00 -07:00
Friendika 5dcc10a5d9 working on long-term solution to relay issue 2011-10-15 03:26:37 -07:00
Friendika af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika 4eae1e5d8a don't propagate deletions for other people's stuff 2011-10-13 15:32:43 -07:00
Friendika 2911bf9434 sql issue item_store 2011-10-13 01:00:06 -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 caf18164f0 Merge branch 'pull' 2011-10-10 12:56:51 -07:00
Friendika 06c268b3db revup 2011-10-10 12:56:15 -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
Friendika 9f4d3bf567 add first,last to D* vcard 2011-10-09 15:49:51 -07:00
Friendika 43973e455a revup 2011-10-08 15:23:19 -07:00
Friendika 1d05c564d4 missing arg to diaspora_transmit from share/unshare 2011-10-07 15:49:41 -07:00
Friendika 272b838233 revup 2011-10-06 17:26:27 -07:00
Friendika d709225b68 better check for orig post author 2011-10-05 13:11:45 -07:00
Friendika 7b648e6da8 performance enhancements 2011-10-04 18:53:56 -07:00
Friendika dfd5cc57c2 tagmatch available to anon, add paging variable to query 2011-10-03 14:47:18 -07:00
Friendika 8f9656da92 basic support for AS friend requests 2011-10-02 16:18:01 -07:00
Friendika 7d7a149811 db updates for server batch key caching, group visibility 2011-10-01 23:19:20 -07:00
Friendika 96e735fdd2 zot protocol update 2011-10-01 18:54:48 -07:00
Friendika 0508ccf50f restore photo cache 2011-09-30 17:47:33 -07:00
Friendika 097c1f8da7 do not poll for abandoned accounts 2011-09-29 21:20:19 -07:00
Friendika c68569040e added back for photos page until we can get rid of it cleanly 2011-09-29 15:32:16 -07:00
Friendika bedb4eb715 just hostname not url in hm:host - host xrd document 2011-09-28 15:07:01 -07:00
Friendika 4f9c072d66 requeue deliveries on 503 errors which have 'retry-after' headers 2011-09-27 19:27:47 -07:00
Friendika 7e2284043f show profile url in ACL hovertips, add fork identifier to json siteinfo 2011-09-27 05:02:25 -07:00
Fabio Comuni 939449602a Merge remote-tracking branch 'fabrix/newui' 2011-09-27 08:57:16 +02:00
Friendika e04d9b8646 bug #165 2011-09-26 23:39:47 -07:00
Fabio Comuni 5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika c35342dcb6 revision update 2011-09-25 22:12:06 -07:00
Friendika 4846d114a8 project fork 2011-09-25 01:59:14 -07:00
Friendika b13f81bdc5 . 2011-09-24 05:30:15 -07:00
Friendika fda9e6f252 increase pcre backtrack limit 2011-09-22 17:35:49 -07:00
Friendika d6b446d63f starting the big delivery shakeup 2011-09-22 04:11:39 -07:00
Friendika 030e1e82c3 finish up ability to switch languages without function collision 2011-09-21 15:37:16 -07:00
Friendika deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika 9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika 660787916e template escapes 2011-09-19 20:24:32 -07:00
Friendika a810d2a993 put profile photo on photos page 2011-09-19 16:39:23 -07:00
Friendika 672ecc7f7d more tag infrastructure 2011-09-18 22:42:47 -07:00
Friendika 48ee3fa3b9 build diaspora public (batch) message 2011-09-18 20:17:44 -07:00
Friendika 5b3f645939 account expiration structures 2011-09-18 19:53:45 -07:00
Friendika 8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika e2e29b2dea only header encode if necessary 2011-09-18 17:16:02 -07:00
Friendika 5f4ab62fe3 fix bbcode image size 2011-09-18 00:16:18 -07:00
Friendika 5a6a3cab8e may fix diaspora send 2011-09-16 14:46:04 -07:00
Fabio Comuni 9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika 80f94bb12b federation friday update 2011-09-15 17:47:16 -07:00
Fabio Comuni 019b735ec7 Merge branch 'newui' of github.com:fabrixxm/friendika into newui 2011-09-15 10:39:41 +02:00
Fabio Comuni 7e806429cc quattro 2011-09-15 10:38:37 +02:00
Friendika 93c235a912 capitalise Link 2011-09-14 15:30:05 -07:00
Friendika 1248a561e1 group_public_members sql query typo 2011-09-13 15:26:47 -07:00
Friendika 4f24494b0b Dreamhost's unreliable process model is really getting irritating 2011-09-12 19:42:10 -07:00
Friendika 0e441fe196 bug #147 comments not working on private notes page 2011-09-11 15:09:57 -07:00
Friendika d7a2ab9c1f send profile visits to 'redir' window 2011-09-09 16:22:32 -07:00
Friendika 18157769f0 parent eval order issue 2011-09-08 20:00:06 -07:00
fabrixxm d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Friendika c8f6493008 typo fb connector 2011-09-07 14:29:15 -07:00
Friendika a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni 08e54234e3 profiles popup menu in sidebar 2011-09-05 16:55:40 +02:00
Fabio Comuni abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00
Fabio Comuni 9ab9c28b01 fix profile edit link and d* photo urls 2011-09-05 11:32:07 +02:00
Fabio Comuni 2c1aca7ffe fix aside contact block, add edit profiles icon 2011-09-05 11:16:08 +02: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
Friendika 9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika f186863523 revup 2011-09-02 19:27:32 -07:00
Friendika a33edb0042 infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector 2011-09-01 18:02:08 -07:00
Friendika 1621630b06 login_hook 2011-09-01 06:29:29 -07:00
Fabio Comuni 058e329dfb Fix profile vcard and style 2011-09-01 12:37:30 +02:00
Friendika 8bb9226471 add new cut of zot/zid protocol 2011-08-31 19:43:59 -07:00
Fabio Comuni 8b615133d5 remove html from profile vcard code 2011-08-31 17:31:44 +02:00
Fabio Comuni 71d44d78ec Installed apps as array instead of string 2011-08-31 16:17:32 +02:00
Friendika f8da48a880 unsafe chars in admin, add img to diaspora markdown processor 2011-08-30 18:46:34 -07:00
Fabio Comuni d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika 7e79b140f0 don't deliver on first pass if already queued 2011-08-29 17:52:31 -07:00
Friendika 846c4cea7c implement delivery queue in case notifier gets killed 2011-08-28 21:41:42 -07:00
Friendika f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
Friendika e3dbb63393 fix any update issues that may arise from update 1081 2011-08-26 21:51:12 -07:00
Friendika 144f241c5d fix bad embeds 2011-08-26 15:21:21 -07:00
Friendika 21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika d51d42b7d4 revup 2011-08-24 15:55:27 -07:00
Friendika 56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
Friendika eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
fabrixxm d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Friendika 213f832443 add trailing slash to diaspora notify url on send 2011-08-21 17:24:50 -07:00
Friendika 8fa6f49242 until algorithm is sorted, ignore D* verification failures so we can debug the rest 2011-08-20 15:09:09 -07:00
Friendika 8e24db3ef5 incorrect iv length for blocksize 2011-08-19 14:34:28 -07:00
Friendika bc5935061b dfrn friendship issue 2011-08-18 16:47:45 -07:00
Friendika c534dd2969 fill and expire fcontact cache 2011-08-18 04:20:30 -07:00
Friendika 78e1f86110 consistent quotes in vcard 2011-08-18 01:15:48 -07:00
Friendika 9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
Friendika c30f523c62 more d* infrastructure for relaying signed messages and storing non-connected people details 2011-08-17 20:52:18 -07:00
Friendika 96bcaf4331 poormancron - proc_run executing twice, once as function; once as commandline 2011-08-17 18:43:17 -07:00
fabrixxm 07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
Friendika b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika 44918e2736 turn diaspora posts into x-www-form-urlencoded 2011-08-15 17:14:51 -07:00
Friendika 7952961222 diaspora probe/scrape changes 2011-08-14 18:13:52 -07:00
Friendika c9225a691b js_upload reporting 43k file too big 2011-08-13 16:05:03 -07:00
Friendika e15e18e0d1 hopefully fix statusnet bug by altering our feed format slightly 2011-08-12 21:01:51 -07:00
Friendika fda593caed introduction fails if confirmation differs by http vs https 2011-08-12 02:58:29 -07:00
Friendika 684ebd2ed8 enhance random_string, block public email replies 2011-08-10 21:06:35 -07:00
Friendika 1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika 6be5da67b1 reparenting imported item was only partially reparenting. 2011-08-08 19:10:36 -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 aa3a14ec36 bug #117, use realname for screen_name in API if nickname missing 2011-08-05 21:30:12 -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 639204c2ec diaspora structures 2011-08-03 22:05:20 -07:00
Friendika d45a66e700 allow custom avatar sizes - needed for Diaspora hcard/vcard 2011-08-03 21:05:39 -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 b774127616 bug #114, warn about linked Facebook item privacy 2011-08-02 17:04:03 -07:00
Friendika 2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika 8b31ff15f5 breaking up boot file (part of zot refactor) 2011-08-01 16:51:01 -07:00
Friendika e76990ae7b bug #111 - don't parse an @ address as a feed 2011-08-01 16:15:37 -07:00
Friendika 326a873082 merge diaspora/friendika vcard formats - not yet complete 2011-08-01 05:13:59 -07:00
Friendika 0c9f033505 some api enhancements 2011-07-31 16:35:53 -07:00
Friendika 149d52da8b show correct self profile in api 2011-07-30 20:48:55 -07:00
Friendika a61ec584d6 basic diaspora decryption 2011-07-30 00:31:00 -07:00
Friendika ef47a1cf97 revup 2011-07-29 16:05:16 -07:00
Friendika 8e30f6a2f4 one more try - do not link numeric hash tags 2011-07-28 21:05:56 -07:00
Friendika 04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Friendika 822fea9d9d installer text changes 2011-07-27 21:48:02 -07:00
Friendika 94e027af67 deal with browser pre-fetch of the ACL img template '{0}' 2011-07-26 19:20:29 -07:00
Friendika 1441fce04e ignore any fully numeric hash tag 2011-07-25 20:21:16 -07:00
Friendika 21058cdb47 provide ability to use different port 2011-07-25 15:43:28 -07:00
Friendika f1115a1031 revup 2011-07-25 00:17:46 -07:00
Friendika 2e1f74397c revup 2011-07-24 03:58:48 -07:00
Friendika 0fbaac59f0 revup 2011-07-23 00:22:25 -07:00
Friendika 9290283040 revup 2011-07-21 16:14:38 -07:00
Friendika 1d7d4bf8c6 wrong path for salmon verify 2011-07-20 23:14:43 -07:00
Friendika 5307225682 ajax pause - any key to resume 2011-07-20 17:17:08 -07:00
Friendika 6ce5bcee9f revup 2011-07-19 17:24:44 -07:00
Friendika c0b8e63a3f basic diaspora discovery 2011-07-18 18:13:46 -07:00
Friendika 25b4aacf3b green icons for greenzero 2011-07-18 16:42:39 -07:00
Friendika f3bd216112 bug #104 2011-07-17 21:34:02 -07:00
Friendika 43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika 2f0ab97fd7 header fix post_url 2011-07-16 15:57:47 -07:00
Friendika d31f720385 revup 2011-07-15 15:20:16 -07:00
Friendika 69f4db9e12 zot stuff 2011-07-15 03:08:43 -07:00
Friendika 2efb59e439 make lighttpd patch specific to lighttpd, intros don't work on apache 2011-07-14 15:34:00 -07:00
Friendika 7534b8873b link tips on nav bar 2011-07-14 03:05:54 -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 180c15cdf8 zot scraper 2011-07-11 18:28:13 -07:00
Friendika 2a65d01ce2 several fixes to parse_url 2011-07-11 17:23:42 -07:00
Friendika eb604deff5 log twitter post result 2011-07-10 20:46:00 -07:00
Friendika 35edf79abe bug #102 2011-07-09 15:06:53 -07:00
Friendika 5ab30578ae revup 2011-07-07 15:35:42 -07:00
Friendika 5cf9d9d877 revup 2011-07-06 14:29:04 -07: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 d7154a4606 ability to link contacts that are "really me, but on another system/network". 2011-07-05 19:55:09 -07:00
Friendika db30a2342c undo last checkin 2011-07-05 18:21:56 -07:00
Friendika 1a4a6b5ff9 explicitly close db connections - do not rely on process exit 2011-07-05 17:45:33 -07:00
Friendika 308d98f7ac hash tags cannot contains spaces 2011-07-05 16:23:27 -07:00
Friendika 308ffe500a Merge branch 'pull' 2011-07-04 15:45:01 -07:00
Friendika 246b0f1efe revup 2011-07-04 15:44:33 -07:00
aweiher f164a63144 require 'Expect' http-header for non-apache webserver (like lighttpd) 2011-07-04 17:22:47 +02:00
Friendika 5ceeb6752d starred items 2011-07-03 19:41:04 -07:00
Friendika 34df1538f3 one more try at splitting out multiple (> 2) http headers in curl 2011-07-03 03:47:18 -07:00
Friendika 12b114f6ad use another method to strip out headers 2011-07-03 02:19:43 -07:00
Friendika cffc4ef14d alter test for http continuation header. Use regex, ignore length. 2011-07-03 00:34:56 -07:00
Friendika 07dc1c3ca9 db support for starred (favorited) items 2011-07-02 17:56:57 -07:00
Friendika fb0e758ce7 add some indexes to photos 2011-07-01 22:36:33 -07:00
Friendika ccb00d6882 set user-agent 2011-07-01 19:29:56 -07:00
Friendika 9534e335aa doco 2011-07-01 18:21:55 -07:00
Friendika d28d2ff440 better (more consistent) handling of ostatus contacts 2011-07-01 18:18:01 -07:00
Friendika 481cd708ac allow polling to mostly survive minor memory shortages. 2011-06-30 21:56:07 -07:00
Friendika 84ee783a2a match the documentation 2011-06-30 20:34:49 -07:00
Friendika cdddfca0b5 photos were not working in private mail 2011-06-30 19:02:11 -07:00
Friendika b03df35b02 Merge branch 'pull' 2011-06-30 15:33:01 -07:00
Friendika 42a6bc81e9 revup 2011-06-30 15:32:39 -07:00
Fabio Comuni c5cddc7428 profile_sidebar hook use byref values in second argument array 2011-06-30 16:44:54 +02:00
Friendika 994011ddb6 load db configs (config,system) for all "executables" 2011-06-30 01:15:18 -07:00
Friendika ad5b976978 allow spaces in @ tags 2011-06-29 18:59:05 -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 1947b74e5b some basic margins for friend suggestion screen 2011-06-27 16:18:06 -07:00
Friendika 3fe1e19725 pass notify endpoint with friend suggestions 2011-06-26 19:30:57 -07:00
Friendika f7964efa52 revisit friend suggestion structures 2011-06-26 17:57:23 -07:00
Friendika 22e8922088 friend suggest structures, cont. 2011-06-26 05:42:32 -07:00
Friendika 59d9070d13 suggestion template 2011-06-25 19:10:38 -07:00
Friendika 38cf37d3c3 new item view, sort by received date - not posted date. 2011-06-23 17:56:59 -07:00
Friendika 0e809b9301 bug #94 mis-spell Czech 2011-06-23 14:11:23 -07:00
Friendika c23c366ff6 receive friendship suggestion over the wire (dfrn) and store 2011-06-22 19:08:30 -07:00
Friendika a51fc14e69 structures for friend suggestions 2011-06-21 18:03:54 -07:00
Friendika 043bde42a6 fix banding on logo, xhtml compliant list and basic table support 2011-06-21 16:29:43 -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 76ddbff0b5 Merge branch 'pull' 2011-06-19 15:56:07 -07:00
Friendika d8e2dc23b9 revup 2011-06-19 15:55:19 -07:00
fabrixxm b650183cd4 Save in db if addon define "$addon_plugin_admin" function. Add "plugin_admin" column to "addon" table 2011-06-19 15:42:06 +02:00
fabrixxm 10eb79a629 add array support to set_config and get_config 2011-06-19 15:10:31 +02:00
Friendika b58db8420a revup 2011-06-18 15:39:19 -07:00
Friendika 484b248f73 add pagination to admin/user page to support large numbers of users 2011-06-17 16:21:11 -07:00
Friendika bb73c0b9f3 Merge branch 'pull' 2011-06-16 15:29:04 -07:00
Friendika b61a7158da Merge pull request #116 from fabrixxm/admin 
Admin pages
 2011-06-16 15:27:12 -07:00
Friendika 0f3292fefb revup 2011-06-16 15:26:39 -07:00
Fabio Comuni c94b809634 fix a small php notice. 2011-06-16 12:14:04 +02:00
Friendika 7659f2a87a revup 2011-06-15 16:33:02 -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 5dc8fbccb2 enable/disable plugins from admin page 2011-06-14 11:16:27 +02:00
Friendika d5fdd4287d event sharing, cont. 2011-06-13 19:06:49 -07:00
Friendika d66056af9d reduce visibility of lang-select flag (duepuntozero) 2011-06-10 20:39:46 -07:00
Friendika 7c60701efc fixed a few feed problems affecting activity objects/targets 2011-06-10 01:51:14 -07:00
Friendika 67021c132a event communication basics 2011-06-09 16:24:29 -07:00
Friendika df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -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 c0094aa4f8 strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues 2011-06-06 16:26:11 -07:00
Friendika c003eda177 revup 2011-06-06 14:16:22 -07:00
Friendika 4c629e274b begin event module 2011-06-05 23:10:07 -07:00
Friendika 8e3cc8669b alphabetically sort the language selector 2011-06-05 20:45:46 -07:00
Friendika 4284c6f9ee use icon for language selector instead of hotkey 2011-06-05 17:32:56 -07:00
Friendika 05e06889b3 mbstring is now required 2011-06-04 15:34:28 -07:00
Friendika a27391c33a facebook queueing on failure, sync update.php with boot.php update version to avoid race condition 2011-06-03 01:16:17 -07:00
Friendika 2fcb5922c3 don't notify failed FB delivery of likes, which have no id. 2011-06-02 17:41:04 -07:00
Friendika 1e0d3173f8 i before e, except after.... 2011-06-01 21:15:20 -07:00
Friendika e25ded6d96 don't count wall posts in unseen network total 2011-05-31 17:35:24 -07:00
Friendika 9f52e311df sort wall items by date order instead of id. bug #61 2011-05-30 19:59:54 -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 73e0986710 item/event linkage 2011-05-27 18:47:28 -07:00
Friendika a2b26948d8 duplicate likes if we posted it locally and it also comes back from FB 2011-05-27 15:33:01 -07:00
Friendika ecb300177c troublesome feed was a 307 redirect. We didn't recognise 307 2011-05-26 23:10:40 -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 5a0690d940 add attachments to FB posts, fix paren string in statusnet, do not insert attach div into post if no attachments 2011-05-26 06:46:55 -07:00
Friendika 8e56994e5f revup 2011-05-25 15:48:21 -07: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 20a1500c25 open attachment in new window 2011-05-24 20:59:56 -07:00
Friendika 3239381447 better margins 2011-05-24 20:56:49 -07:00
Friendika e7ef3b82f0 clearup float, fix icon 2011-05-24 20:49:19 -07:00
Friendika 87de839974 attachment display 2011-05-24 20:41:29 -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 78b2db3a98 Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-05-23 18:17:02 -07:00
Friendika 3e6180183b improved browser language detect, set user language on login 2011-05-23 17:18:36 -07:00