Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-27 06:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
5511 commits 3 branches 64 tags 241 MiB
Commit graph

942 commits

Author SHA1 Message Date
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