friendica
10754ced3e
category removal
2012-05-04 06:42:56 -07:00
friendica
9ecd128e5e
"show more" friends in common
2012-05-04 01:46:36 -07:00
friendica
421acee65b
implement max load average before queuing/deferring delivery and poller processes
2012-05-03 21:50:48 -07:00
friendica
2818cb28e9
use html symbols for double quotes
2012-05-03 17:19:53 -07:00
friendica
f3e18df55d
string update
2012-05-03 16:55:03 -07:00
friendica
e7ff35f27d
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
2012-05-02 22:33:51 -07:00
friendica
e7580b71e1
use cid rather than uid in perms
2012-05-02 21:00:39 -07:00
Zach Prezkuta
5d957c3803
Modify events_post() in mod/events.php to set the private field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
2012-05-02 21:12:57 -06:00
friendica
06d6ab4812
delineate the new profile changes from the rest of the text
2012-05-02 01:07:23 -07:00
friendica
91085f0969
really fat fingers today - though none of this has gone further than my own site
2012-05-01 19:24:22 -07:00
friendica
8bd6e1aef9
first try common friends for visitors
2012-05-01 19:16:18 -07:00
friendica
d48cd0f9a3
hidden plugins (add .hidden file to dir)
2012-04-30 23:07:52 -07:00
friendica
3c0cf72716
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
...
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
friendica
05df5337dd
start adding tooltips to tab menus
2012-04-30 05:15:29 -07:00
friendica
5d10672fb8
fix join group notifications
2012-04-30 04:11:42 -07:00
friendica
3ff8fe53a2
provide "xxx joined yyy" notifications
2012-04-30 01:25:25 -07:00
friendica
928faf3b97
typo in profile_selectors, fix remote tagging
2012-04-29 22:34:05 -07:00
friendica
0153d86b7f
admin page to manage failed updates
2012-04-29 19:10:07 -07:00
friendica
def6f0b408
the heart should really be red.
2012-04-29 02:11:33 -07:00
friendica
735f518fd8
fix location change notification
2012-04-29 01:49:54 -07:00
friendica
a9dba2720b
enhanced profile reporting for single values
2012-04-29 01:42:48 -07:00
friendica
f163aed66d
break up poller into separate processes
2012-04-27 23:17:40 -07:00
friendica
39d0926d09
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
2012-04-27 19:39:19 -07:00
friendica
26c53580d1
implement contact archival
2012-04-27 17:17:58 -07:00
friendica
ecc4962bd1
pass zrl to dfrn_request as fallback
2012-04-27 16:23:25 -07:00
tommy tomson
77a0570162
add link "remove account" to /mod/settings.php
2012-04-26 17:21:27 +02:00
friendica
c9e5609cbf
bug #307 , explaining decentralised private photos is impossible.
2012-04-25 05:41:32 -07:00
friendica
2064d86cb3
separate tag search from body search
2012-04-23 22:41:32 -07:00
friendica
3637534119
move unfriend to standalone function for use in account removal
2012-04-23 19:42:57 -07: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
8f0f644295
protect jappixmini/proxy from typo check, more work on email2 connector
2012-04-23 05:16:57 -07:00
friendica
724e1d15d0
Merge https://github.com/friendica/friendica into pull
2012-04-22 16:25:02 -07:00
friendica
00cb7f9efb
don't allow non-existent themes as choices
2012-04-22 16:24:29 -07:00
friendica
c0dffa7442
Merge pull request #258 from unary/api
...
api: add support for StatusNet-style media param to API
2012-04-22 15:43:24 -07:00
Michael Johnston
76aa9b3037
api: add support for StatusNet-style media param to API
2012-04-22 13:37:25 -04:00
Tobias Hößl
27c23229c4
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 13:31:07 +00:00
Tobias Hößl
3116db1a74
Add a hook
2012-04-22 13:28:54 +00:00
Fabio Comuni
3bb785fdad
Merge remote-tracking branch 'CatoTH/master' into req245
2012-04-20 09:25:51 +02:00
Fabio Comuni
fddf21d983
filebrowser: fix style, show 10 recent photos if not in an album
2012-04-18 15:15:52 +02:00
Fabio Comuni
0630120455
filebrowser: more style, load min and max scale photos
2012-04-18 14:56:03 +02:00
Fabio Comuni
e2e6b56c44
tinymce: add filebrowser for photos and attached files
2012-04-18 13:23:42 +02:00
Tobias Hößl
b885fedee1
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:36:48 +00:00
Tobias Hößl
d7e750ad74
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:24:47 +00:00
friendica
8269d6aa19
Merge pull request #240 from CatoTH/master
...
Some bugfixes / Notices
2012-04-17 06:50:09 -07:00
friendica
e6330e3b96
naked br appearing when attaching and textplain
2012-04-17 06:11:41 -07:00
Tobias Hößl
720c8324c7
Some Bugfixes, and variable checks
2012-04-17 11:33:50 +00:00
friendica
7ebca2b37d
rev update
2012-04-16 22:58:52 -07:00
friendica
93df525f5c
Merge pull request #238 from annando/master
...
API: Support of the statusnet application
2012-04-15 16:00:07 -07:00
friendica
0a3454c841
function name typo
2012-04-15 05:11:52 -07:00
friendica
0939029b74
track requested profile error msg
2012-04-14 14:45:09 -07:00
friendica
6af4183302
zrl on random profile
2012-04-14 05:07:00 -07:00
Michael Vogel
4e220ec391
Merge commit 'upstream/master'
2012-04-14 13:15:25 +02:00
friendica
0d869ceb65
pass zrl's to/through global directory
2012-04-14 03:51:41 -07:00
friendica
bfb821e918
well that was a silly mistake...
2012-04-13 16:12:06 -07:00
friendica
d1b57d6e74
setting wasn't being applied
2012-04-13 15:37:25 -07:00
Fabio Comuni
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
2012-04-13 11:59:25 +02:00
Fabio Comuni
138a0e06b8
admin: change global theme settings
2012-04-13 11:20:05 +02:00
friendica
3c4e6d3461
bug #369 - show contacts who are not in any groups
2012-04-12 23:06:41 -07:00
friendica
af68d033e3
extended the "interesting" profile attributes
2012-04-12 21:58:15 -07:00
friendica
446e962bb8
send link directly to profile tab
2012-04-12 21:38:40 -07:00
friendica
2b339d5a6b
stray log statements
2012-04-12 21:21:35 -07:00
friendica
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a
allow setting default new friend notify
2012-04-12 18:15:46 -07:00
friendica
7e2d4d4026
turn off new friend activity by default
2012-04-12 16:51:57 -07:00
Michael Vogel
572678fef9
Merge commit 'upstream/master'
...
Conflicts:
include/dba.php
2012-04-13 00:10:41 +02:00
friendica
60871555f5
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
2012-04-12 06:50:11 -07:00
Fabio Comuni
18ecac4e93
settings: remove call to profile_load()
2012-04-12 08:42:00 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
friendica
967ed8e23f
Merge https://github.com/friendica/friendica into pull
2012-04-10 20:51:04 -07:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
Simon L'nu
75c7877986
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
* master:
2012-04-10 23:34:55 -04:00
Simon L'nu
2af41ee57b
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:34:39 -04:00
friendica
0fa932853c
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
2012-04-10 20:09:51 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
18e225b051
move all fix_mce to one function so it can easily be undone
2012-04-10 17:14:07 -07:00
friendica
ab46f95683
duplicate community posts
2012-04-10 16:59:30 -07:00
friendica
8f40e8546e
fix_mce_lf contact edit page
2012-04-10 16:32:38 -07:00
friendica
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
Klaus Weidenbach
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
...
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
2012-04-09 21:22:09 +02:00
friendica
92c20895e0
use local_user for tag completion if available. See bug #368
2012-04-09 04:55:52 -07:00
friendica
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
friendica
977625a53b
fix to wall_upload photos default permissions to use cid rather than uid.
2012-04-08 16:19:45 -07:00
friendica
cf2d8ef7a6
tag tests cont.
2012-04-07 02:11:56 -07:00
friendica
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
friendica
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
friendica
6bc7e6e09f
add network_tabs hook
2012-04-05 21:42:47 -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
friendica
9b6e91086b
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
2012-04-05 02:15:03 -07:00
friendica
b45327b856
let's catch d* disabled at a higher level and not waste any resources on it.
2012-04-04 20:45:48 -07:00
Michael Johnston
da0eb2d4c9
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 23:08:16 -04:00
friendica
f63636ed14
well that was a stupid mistake...
2012-04-04 17:19:46 -07:00
friendica
60c57704c6
better handling of reshares containing embeds
2012-04-04 02:02:23 -07:00
friendica
8e928d101b
display settings hooks
2012-04-03 22:01:52 -07:00
friendica
466188ebd7
re-opened bug #363
2012-04-03 20:14:37 -07:00
friendica
96abee53e4
this is better
2012-04-03 19:20:39 -07:00
friendica
dbe16afcd4
include contact_widgets for categories_widget when doing updates
2012-04-03 19:16:02 -07:00
friendica
4b762ff923
suppress duplicates in search
2012-04-03 02:44:29 -07:00
friendica
5d0d9f8772
make contact ssl_policy change a function since it is used in a few places
2012-04-02 23:07:26 -07:00
friendica
f4721955db
more ssl policy fixes and prevent delivery to soapbox when using local delivery
2012-04-02 21:01:19 -07:00
friendica
e1de2e3de0
don't change ssl settings on local photos for remote contact
2012-04-02 19:38:13 -07:00
friendica
9391fc965d
bug #363 and a couple of other reported ssl link issues
2012-04-02 17:43:11 -07:00
friendica
2352e6c1cb
make the "new calendar" (javascript interactive) the default
2012-04-02 01:46:35 -07:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
Thomas Willingham
210586eaed
Merge remote-tracking branch 'upstream/master'
2012-04-02 00:29:27 +01:00
Thomas Willingham
8406803473
modified: mod/newmember.php
...
Add a link to the quick start
2012-04-02 00:27:47 +01:00
friendica
f95db4382e
check for style.php existence before inclusion
2012-04-01 16:21:55 -07:00
Thomas Willingham
d0ddd380e7
Moved Diaspora notes away from top, per user request
2012-04-02 00:18:03 +01:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
friendica
ea10bba147
fix "between yourself and You" in mail list
2012-03-31 20:08:32 -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
53f799f2bc
handle escaped file chars in display and search
2012-03-31 15:25:17 -07:00
friendica
adebc2793e
register hooks for a COPA plugin
2012-03-31 06:15:33 -07:00
friendica
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
friendica
8c928e67ba
warning cleanup
2012-03-30 23:18:46 -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
Fabio Comuni
054d21a2e8
settings: add "display settings" tab, with UI-related settings.
...
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
friendica
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
friendica
d83bfd464b
zrl into people searches
2012-03-29 22:20:14 -07:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
friendica
75f778a504
provide a way to specify an admin account for siteinfo if more than one have admin email address
2012-03-29 18:22:20 -07:00
fabrixxm
3ee529d095
Merge pull request #185 from fabrixxm/master
...
Updated private message pages
2012-03-28 23:47:23 -07:00
friendica
3f89adfd62
wrong var for notify total
2012-03-28 17:51:43 -07:00
friendica
77715c0c65
fix notification total
2012-03-28 17:44:24 -07:00
friendica
7956c2d08e
improved rw notifications
2012-03-28 17:21:56 -07:00
friendica
4fe0b56d76
bug #349 - email notls setting
2012-03-28 14:54:00 -07:00
Fabio Comuni
50711040cb
message: remove tabs, move new message link to aside, all message with gmail-style
2012-03-28 15:31:58 +02:00
friendica
e894775a39
Merge branch 'pull'
2012-03-28 05:16:25 -07:00
friendica
b58dc43148
Merge branch 'pull'
2012-03-28 03:19:42 -07:00
friendica
b18086097e
title not updated when editing post
2012-03-28 03:18:26 -07:00
Fabio Comuni
767245e9ff
viewsrc: return only body if page is requested via ajax
2012-03-28 11:42:04 +02:00
Fabio Comuni
0a2675d8b6
filer: replace "file as" prompt with combobox opened in fancybox
2012-03-28 10:49:34 +02:00
friendica
117d2165f5
form security error when using existing photo
2012-03-27 04:51:20 -07:00
friendica
7c6c3d36f5
profile wall privacy
2012-03-27 01:31:47 -07:00
friendica
daa036e34c
@-completion bug
2012-03-26 21:48:04 -07:00
friendica
4c585f759f
theme description with preview (non-translatable unfortunately)
2012-03-26 18:15:10 -07:00
friendica
b5d0315d55
preparation for some possibly killer features
2012-03-26 17:57:27 -07:00
friendica
1e2e6f5ba9
more wordsmithing of the Friendica invitation email
2012-03-25 20:52:34 -07:00
friendica
be52ec6f5a
Merge branch 'pull'
2012-03-25 19:48:17 -07:00
Simon
7873347c65
Merge pull request #167 from unary/typo
...
typo datarry -> datarray
2012-03-25 19:47:39 -07:00
friendica
c88674aaf2
theme preview for end users
2012-03-25 19:05:14 -07:00
friendica
7ef1ed2d70
theme screenshots
2012-03-25 17:55:43 -07:00
Michael Johnston
ca1e2254c9
typo datarry -> datarray
2012-03-25 16:00:11 -04:00
friendica
6780b76b0c
improved the inivitations and added a bit of sales pitch.
2012-03-24 23:04:18 -07:00
friendica
f1cb287742
bug #329 - compress the plugin list on the friendica info page
2012-03-24 21:50:04 -07:00
friendica
8c4fbc3b4d
add the bang
2012-03-24 03:11:45 -07:00
friendica
db5ec58863
network filter is now a permission group
2012-03-24 01:33:50 -07:00
Fabio Comuni
82cc86a41a
user settings: don't show emoticons
2012-03-23 12:07:22 +01:00
friendica
528d795fb6
ability to change tags in edited posts
2012-03-22 16:17:10 -07:00
friendica
40d19d5b8c
normalise comparison link on delegation page
2012-03-22 06:19:27 -07: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
f1bbe03df1
work around doubled linefeeds in tinymce3.5b2
2012-03-21 21:42:27 -07:00
friendica
c1d6ece98e
revert permissions relaxation on community
2012-03-21 14:56:06 -07:00
friendica
ef33cfcc9a
move friend suggestions to top of contact page, add default contact profile photos if missing
2012-03-20 16:05:32 -07:00
friendica
a72a23b6d6
missed a default profile photo replacement in notifications
2012-03-20 15:43:34 -07:00
friendica
894278dbcc
change default profile photo to something more interesting than a reddish brown square
2012-03-20 15:41:06 -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
9df7972993
bug #339 - lostpass sending to username, not email
2012-03-20 01:50:20 -07:00
friendica
b8f6312408
cleanup after openid refactoring
2012-03-19 15:10:14 -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
cf2edb5b9a
ctrl + left|right cursor keys to prev/next photos
2012-03-19 01:20:53 -07:00
Simon
283bc51acf
Merge pull request #149 from CatoTH/master
...
Add a missing security token [Using photos as profile photos]
2012-03-19 00:40:51 -07:00
Tobias Hößl
0341078a73
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
2012-03-19 07:37:09 +00:00
friendica
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
Tobias Hößl
453b5b46a3
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
2012-03-18 15:44:33 +00:00
friendica
9e731506c2
remove admin view of local directory
2012-03-17 22:14:17 -07:00
friendica
e0e008fb8d
template processor broken with foreach k=>v and k is integer 0
2012-03-17 02:26:52 -07:00
friendica
057a142b8c
cut/paste error
2012-03-17 00:08:52 -07:00
Simon L'nu
49540fb958
make auto-complete work in more places
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 21:20:23 -04:00
friendica
82f2bfea5b
convert boolean or int settings to strings to work around issues with template processing
2012-03-16 16:05:16 -07:00
Simon
1246a40ec2
Merge pull request #141 from CatoTH/master
...
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl
75823c2353
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
2012-03-16 17:45:07 +00:00
friendica
28f941193d
syntax error from pasted text, remove ^M's
2012-03-16 06:02:26 -07:00
friendica
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
friendica
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
friendica
f96aff5518
more recycle fixes for plaintext
2012-03-15 03:47:02 -07:00
friendica
9cd1c35c22
fix recycle symbol when using plaintext editor
2012-03-15 03:44:41 -07:00
friendica
b06c5983a4
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
2012-03-14 21:58:54 -07:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
friendica
531201f2a1
Merge pull request #132 from campino/master
...
Test cases
2012-03-14 15:16:30 -07:00
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
Alexander Kampmann
70709a8825
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
view/de/strings.php
2012-03-14 12:57:35 +01:00
Alexander Kampmann
509532d168
get_tags tests corrected. They test for the right things now.
2012-03-14 12:30:52 +01: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
Alexander Kampmann
bce3bfff38
get tags test improved
2012-03-12 13:59:00 +01: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
Alexander Kampmann
f8042d0445
splitted test cases.
2012-03-09 12:57:11 +01: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
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
