friendica
|
dcdfa96a1f
|
Merge branch 'pull'
|
2012-03-14 14:34:52 -07:00 |
|
|
friendica
|
2dc527609e
|
Merge https://github.com/friendica/friendica into pull
|
2012-03-14 14:34:48 -07:00 |
|
Simon L'nu
|
0bf9595ab1
|
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-14 11:00:20 -04:00 |
|
|
friendica
|
7e270b043c
|
addon settings form error
|
2012-03-13 23:52:13 -07:00 |
|
|
friendica
|
4972d7ef6e
|
more work on filer, comment level and file tag removal
|
2012-03-13 20:46:37 -07:00 |
|
|
friendica
|
de017d1ed7
|
sort inbox by recently replied conversations first
|
2012-03-13 19:27:52 -07:00 |
|
|
friendica
|
be48fff157
|
file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
|
2012-03-13 18:13:03 -07:00 |
|
|
friendica
|
db80ffa0ff
|
don't count self in number of contatcs
|
2012-03-13 16:02:20 -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 |
|
Tobias Hößl
|
59766b944c
|
Some security against XSRF-attacks
|
2012-03-12 20:17:37 +00:00 |
|
|
Tobias Hößl
|
9574f7df03
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-12 19:06:45 +00:00 |
|
|
friendica
|
93058af4fc
|
backend for "save to file" feature
|
2012-03-11 20:19:56 -07:00 |
|
|
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
|
d9c5d9d2eb
|
default the text template var on conversations
|
2012-03-10 15:53:36 -08:00 |
|
|
friendica
|
1bddd48661
|
bug #327 - composed private message is lost if no recip specified.
|
2012-03-10 15:50:51 -08:00 |
|
Michael Johnston
|
fd1f8fb436
|
allow user to set number of items to show on network page
|
2012-03-09 21:29:39 -05:00 |
|
|
friendica
|
42d622d6bf
|
recover contacts total count which got lost
|
2012-03-09 02:50:57 -08:00 |
|
|
Tobias Hößl
|
635958e11d
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-09 10:00:12 +00:00 |
|
|
friendica
|
3878b58f0d
|
bug #324 - tinymce used for mail even if editplain being used.
|
2012-03-09 00:47:10 -08:00 |
|
|
friendica
|
03b5e3aa0c
|
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
|
2012-03-07 21:12:31 -08:00 |
|
|
friendica
|
7ad2dd6565
|
fix photos after permissions_sql change
|
2012-03-06 17:52:00 -08:00 |
|
|
friendica
|
88cd5800cf
|
[privacy] rework latest fix
|
2012-03-06 17:21:14 -08:00 |
|
|
friendica
|
39a49d51e3
|
remove stray debugging
|
2012-03-06 16:28:52 -08:00 |
|
|
friendica
|
7431bd9509
|
fix html reshares when editplain in use
|
2012-03-06 15:28:27 -08:00 |
|
|
friendica
|
a464e4d33f
|
search should be ok, but a little extra security won't hurt
|
2012-03-06 15:15:59 -08:00 |
|
|
friendica
|
21887a36fd
|
[PRIVACY] privacy issue bug #314
|
2012-03-06 14:53:14 -08:00 |
|
|
friendica
|
8fb0ea4048
|
bugs #312, #313
|
2012-03-06 14:27:53 -08:00 |
|
|
friendica
|
23460302f5
|
some admin page fixes and cleanup
|
2012-03-05 18:51:21 -08:00 |
|
|
Tobias Hößl
|
02a9fd5dc1
|
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
|
2012-03-03 10:44:34 +00:00 |
|
Fabio Comuni
|
5fc3c3ab85
|
group: fix create new group form
|
2012-03-02 15:40:17 +01:00 |
|
|
Fabio Comuni
|
b6b7742579
|
Merge remote-tracking branch 'friendica/master' into randomerror
|
2012-03-01 11:47:45 +01:00 |
|
|
Fabio Comuni
|
f0b6e76293
|
admin: fix small string
|
2012-03-01 11:28:48 +01: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 |
|
|
Fabio Comuni
|
b71a3af457
|
Merge remote-tracking branch 'friendica/master' into randomerror
|
2012-02-29 14:58:37 +01:00 |
|
|
friendica
|
60ae0d8974
|
cleaned up mess created when both people request friendship and one approves as duplex
|
2012-02-28 17:32:44 -08:00 |
|
|
friendica
|
f40ef1bf46
|
Merge branch 'pull'
|
2012-02-28 14:53:41 -08:00 |
|
|
friendica
|
4dd4a22582
|
From Tobias H - catch some irregularities caused by cut/paste code
|
2012-02-28 14:52:23 -08:00 |
|
|
Tobias Hößl
|
5bb8ed4b8b
|
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
|
2012-02-28 21:56:42 +00:00 |
|
|
Tobias Hößl
|
3d249f0edd
|
Merge remote branch 'upstream/master'
|
2012-02-28 21:19:02 +00:00 |
|
|
fabrixxm
|
733f830be4
|
fix url and network display
|
2012-02-28 19:10:27 +01:00 |
|
|
Tobias Hößl
|
36a1a43f06
|
Avoid notices
|
2012-02-28 13:42:12 +00:00 |
|
|
Tobias Hößl
|
f48556cbc0
|
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
|
2012-02-28 13:40:41 +00:00 |
|
|
friendica
|
53412dacd4
|
update globaldir when page-type changes, add spam date field
|
2012-02-27 23:27:16 -08:00 |
|
|
friendica
|
2b730ae86d
|
clicking contact on contacts page broken link
|
2012-02-27 18:46:11 -08:00 |
|
|
Fabio Comuni
|
42d591d257
|
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
|
2012-02-27 18:48:59 +01:00 |
|
|
friendica
|
a1861d1128
|
tagging missing from wallwall and a couple of themes, star missing from dispy
|
2012-02-26 16:29:06 -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 |
|