aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-114-9/+31
|\
| * default the text template var on conversationsfriendica2012-03-101-0/+1
| * bug #327 - composed private message is lost if no recip specified.friendica2012-03-101-5/+15
| * allow user to set number of items to show on network pageMichael Johnston2012-03-092-1/+11
| * recover contacts total count which got lostfriendica2012-03-091-3/+4
* | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-0911-100/+149
|\|
| * bug #324 - tinymce used for mail even if editplain being used.friendica2012-03-091-0/+6
| * reworked fix from unary for bug #323 (due to incorrect use of array_key_exist...friendica2012-03-071-1/+1
| * fix photos after permissions_sql changefriendica2012-03-062-2/+2
| * [privacy] rework latest fixfriendica2012-03-061-3/+0
| * remove stray debuggingfriendica2012-03-061-2/+2
| * fix html reshares when editplain in usefriendica2012-03-061-5/+13
| * search should be ok, but a little extra security won't hurtfriendica2012-03-061-1/+1
| * [PRIVACY] privacy issue bug #314friendica2012-03-061-2/+5
| * bugs #312, #313friendica2012-03-062-35/+33
| * some admin page fixes and cleanupfriendica2012-03-051-3/+7
| * group: fix create new group formFabio Comuni2012-03-021-0/+1
| * Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-03-012-4/+25
| |\
| | * notification enhancementsfriendica2012-02-291-1/+3
| | * better handling of multiple notifications for same item, and old notificationsfriendica2012-02-292-4/+23
| * | admin: fix small stringFabio Comuni2012-03-011-2/+5
| * | Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-02-2916-193/+432
| |\|
| | * cleaned up mess created when both people request friendship and one approves ...friendica2012-02-281-1/+11
| | * Merge branch 'pull'friendica2012-02-281-1/+2
| | |\
| | * | From Tobias H - catch some irregularities caused by cut/paste codefriendica2012-02-282-5/+5
| * | | less html in mod/group.php, template for group members editor, quattro theme ...Fabio Comuni2012-02-231-41/+39
* | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a no...Tobias Hößl2012-03-031-1/+1
* | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.phpTobias Hößl2012-02-281-6/+8
* | | | Merge remote branch 'upstream/master'Tobias Hößl2012-02-285-27/+43
|\ \ \ \ | | |_|/ | |/| |
| * | | fix url and network displayfabrixxm2012-02-281-1/+2
| | |/ | |/|
| * | update globaldir when page-type changes, add spam date fieldfriendica2012-02-271-1/+3
| * | clicking contact on contacts page broken linkfriendica2012-02-271-0/+1
| * | revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-271-2/+2
| * | tagging missing from wallwall and a couple of themes, star missing from dispyfriendica2012-02-261-0/+1
| * | Merge pull request #50 from annando/masterfriendica2012-02-261-22/+31
| |\ \
| | * | Mail: New options for actions after importing mails.Michael2012-02-261-22/+31
| * | | Merge pull request #49 from CatoTH/masterfriendica2012-02-264-7/+12
| |\ \ \ | | |/ / | |/| |
| * | | show experimental and unsupported theme status on theme admin pagefriendica2012-02-261-2/+4
* | | | Avoid noticesTobias Hößl2012-02-281-1/+1
* | | | contact.network is used later to check if a direct link or a redirect by /red...Tobias Hößl2012-02-281-1/+1
| |/ / |/| |
* | | is not always defined; but if defined, then always of type integerTobias Hößl2012-02-261-1/+1
* | | necessare fields not loaded from DBTobias Hößl2012-02-262-3/+6
* | | should probably be a->user['hidewall'] instead of profile['hidewall']Tobias Hößl2012-02-261-3/+5
|/ /
* | mod/item.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-1/+2
* | scale external imagesfriendica2012-02-251-0/+2
* | fixed link for toggling plugin from detail pagefriendica2012-02-251-1/+1
* | sysnotify count in wrong location, and wrong numberfriendica2012-02-251-2/+10
* | theme seen,unseen notificationsfriendica2012-02-251-14/+14
* | theme info (like plugin info)friendica2012-02-251-2/+2
* | notifications to zeros, bug in notify linkfriendica2012-02-241-3/+3