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
friendica
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
Tobias Hößl
b102a1d5ec
is not always defined; but if defined, then always of type integer
2012-02-26 20:43:23 +00:00
Tobias Hößl
792abc3a24
necessare fields not loaded from DB
2012-02-26 20:40:41 +00:00
Tobias Hößl
fd9c12128a
should probably be a->user['hidewall'] instead of profile['hidewall']
2012-02-26 20:39:37 +00:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr
2d5f8b4b48
mod/item.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de
scale external images
2012-02-25 14:22:51 -08:00
friendica
579738aff7
fixed link for toggling plugin from detail page
2012-02-25 13:00:44 -08:00
friendica
c90bac5727
sysnotify count in wrong location, and wrong number
2012-02-25 04:37:12 -08:00
friendica
4839c235da
theme seen,unseen notifications
2012-02-25 03:28:07 -08:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
6092567c97
notifications to zeros, bug in notify link
2012-02-24 23:44:55 -08:00
friendica
44c23cda8e
theme shakeup commences - themes are now administered in admin panel.
2012-02-23 20:29:09 -08:00
friendica
65ddefe9c5
system notifications to notify module, untranslated string in notifications.tpl
2012-02-23 17:37:03 -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
Fabio Comuni
fd3274ff53
less html in mod/group.php, template for group members editor, quattro theme for group edit.
2012-02-23 16:17:36 +01:00
Fabio Comuni
cbc60d525e
quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
...
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01:00
friendica
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
friendica
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
friendica
a19ddb48ee
waitman gobble media upload via api patch
2012-02-21 23:35:50 -08:00
friendica
53d3ee8852
new notifications
2012-02-21 19:03:55 -08:00
friendica
f03aaf554e
mark all notifications read
2012-02-21 16:59:57 -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
Abinoam P. Marques Jr
9b2171ecee
mod/match.php - Friendika -> Friendica
2012-02-20 19:41:01 -03:00
Abinoam P. Marques Jr
6797485f6e
mod/dirfind.php - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr
12a8796854
mod/dfrn_request.php and templates - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Fabio Comuni
dd09c2d125
use info() for successfull dfrn confirmation instead of notice()
2012-02-20 20:39:19 +01:00
Fabio Comuni
edac27c791
ping: return all introductions detail when there are more than one
2012-02-20 20:21:34 +01:00
Abinoam P. Marques Jr
dedfc300a0
Fixed log file issues on a freshly installed Friendica.
...
* Check to see if log file exists.
* After trying to open it, check to see if it went ok.
* So, check to see if the file size != 0 (fread error with size = 0)
2012-02-18 14:19:35 -08:00
friendica
1b9c03f6fc
new notifications - implement storage
2012-02-18 02:57:42 -08:00
friendica
75acc1ed96
support plaintext on editpost, editorinit called before all buttons laid out
2012-02-17 11:49:27 -08:00
friendica
8ff6cb8406
a couple more items to make sure forum delegates can't access if the forum login is shared with the site admin account
2012-02-16 23:58:07 -08:00
friendica
0500fc2826
do not under any circumstances allow a delegated forum admin to access the site admin page.
2012-02-16 23:50:57 -08:00
Abinoam P. Marques Jr.
7b59ad6148
Merge pull request #37 from abinoam/oex
...
Oexchange Small Fix
2012-02-16 04:53:37 -08:00
Abinoam P. Marques Jr
4ac001663e
oexchange small fix [_POST -> _REQUEST]
2012-02-16 02:52:35 -08:00
friendica
c8704040d3
improvements in newmember page
2012-02-16 01:57:59 -08:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
friendica
d054426101
encode email headers on message deliveries
2012-02-15 15:28:32 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
73bee08ac2
enable ajax calendar with $a->config['experimentals']['new_calendar']=1
2012-02-15 12:47:50 +01:00
friendica
07ca8d6574
starred/bookmark searches only returning conversation head without comments
2012-02-14 23:29:24 -08:00
Fabio Comuni
7140e56d1f
events js: pass only first line of desc as title; item.desc and item.location as html
2012-02-14 16:48:34 +01:00
Fabio Comuni
22cfb77173
events: first test for full-javascript events calendar
2012-02-14 16:19:48 +01:00
friendica
d2a9ce9362
more contacts categorisation, page cleanup
2012-02-13 22:48:35 -08:00
friendica
4de67d95ce
proper tab selection when network or search is in effect
2012-02-13 20:42:10 -08:00
friendica
d75b6a00d4
tabs and total count for contacts page
2012-02-13 20:38:00 -08:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
Fabio Comuni
3e664dbdfe
reshare in "display" view
2012-02-13 09:33:20 +01:00
friendica
4cfb1fe0cf
refresh contact record after setting change
2012-02-11 23:17:55 -08:00
friendica
d856ae1fa5
bug #279 , add network selector widget to contacts page
2012-02-11 21:39:51 -08:00
friendica
0c4606682f
fix link/bookmark reshares
2012-02-11 19:21:41 -08:00
friendica
da946bb9b0
bug #278 show only blocked contacts
2012-02-11 03:07:15 -08:00
Abinoam P. Marques Jr
2984b8d5d2
bug #270 - solved
2012-02-10 14:03:43 -08:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
7b0a005441
edit post not working after plaintext editor fixes, missing some recent editor template changes
2012-02-09 15:58:26 -08:00
friendica
795e02aa14
bug #273 - no $baseurl variable expansion in install template
2012-02-09 15:13:34 -08:00
friendica
11517a027b
if removing a contact after viewing the third page of contacts, go back to page 3
2012-02-08 21:15:26 -08:00
friendica
b0ee8dd409
begin cmin, cmax
2012-02-08 17:56:23 -08:00
friendica
bb22464165
browser being sent to update_community
2012-02-08 03:40:49 -08:00
friendica
c6cdad946e
more fixes for textmode
2012-02-07 00:13:16 -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
c68235d10d
placeholder - spam tab on network page
2012-02-01 00:20:54 -08:00
friendica
c0c0f2dc15
add closeness attribute
2012-01-31 23:54:53 -08:00
friendica
4993f4f1d6
allow plugin to abort message posting, fix half-duplex D* relationship
2012-01-30 20:49:54 -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