aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for ↵friendica2012-04-232-6/+49
| | | | autocomplete of PM recips
* protect jappixmini/proxy from typo check, more work on email2 connectorfriendica2012-04-231-1/+49
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-222-12/+28
|\
| * Merge pull request #258 from unary/apifriendica2012-04-221-12/+26
| |\ | | | | | | api: add support for StatusNet-style media param to API
| | * api: add support for StatusNet-style media param to APIMichael Johnston2012-04-221-12/+26
| | |
| * | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-04-221-0/+99
| |\|
| * | Add a hookTobias Hößl2012-04-221-0/+2
| | |
* | | don't allow non-existent themes as choicesfriendica2012-04-221-2/+2
| |/ |/|
* | Merge remote-tracking branch 'CatoTH/master' into req245Fabio Comuni2012-04-201-24/+96
|\|
| * XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-181-4/+13
| |
| * XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-181-20/+83
| |
* | filebrowser: fix style, show 10 recent photos if not in an albumFabio Comuni2012-04-181-2/+7
| |
* | filebrowser: more style, load min and max scale photosFabio Comuni2012-04-181-29/+23
| |
* | tinymce: add filebrowser for photos and attached filesFabio Comuni2012-04-181-0/+100
|/
* Merge pull request #240 from CatoTH/masterfriendica2012-04-172-2/+1
|\ | | | | Some bugfixes / Notices
| * Some Bugfixes, and variable checksTobias Hößl2012-04-172-2/+1
| |
* | naked br appearing when attaching and textplainfriendica2012-04-171-1/+6
|/
* rev updatefriendica2012-04-161-2/+5
|
* Merge pull request #238 from annando/masterfriendica2012-04-151-0/+29
|\ | | | | API: Support of the statusnet application
| * Merge commit 'upstream/master'Michael Vogel2012-04-146-15/+218
| |\
| * \ Merge commit 'upstream/master'Michael Vogel2012-04-132-50/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php
| * \ \ Merge commit 'upstream/master'Michael Vogel2012-04-1114-60/+130
| |\ \ \
| * | | | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-0/+29
| | | | |
* | | | | function name typofriendica2012-04-151-1/+1
| | | | |
* | | | | track requested profile error msgfriendica2012-04-141-0/+1
| | | | |
* | | | | zrl on random profilefriendica2012-04-141-1/+1
| |_|_|/ |/| | |
* | | | pass zrl's to/through global directoryfriendica2012-04-141-1/+1
| | | |
* | | | well that was a silly mistake...friendica2012-04-131-2/+2
| | | |
* | | | setting wasn't being appliedfriendica2012-04-131-2/+2
| | | |
* | | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-04-134-4/+179
|\ \ \ \
| * | | | bug #369 - show contacts who are not in any groupsfriendica2012-04-121-0/+65
| | | | |
| * | | | extended the "interesting" profile attributesfriendica2012-04-121-1/+8
| | | | |
| * | | | send link directly to profile tabfriendica2012-04-121-3/+3
| | | | |
| * | | | stray log statementsfriendica2012-04-121-2/+0
| | | | |
| * | | | profile change activitiesfriendica2012-04-122-7/+102
| | | | |
| * | | | allow setting default new friend notifyfriendica2012-04-122-1/+11
| | | | |
| * | | | turn off new friend activity by defaultfriendica2012-04-121-1/+1
| | |_|/ | |/| |
* / | | admin: change global theme settingsFabio Comuni2012-04-131-9/+37
|/ / /
* | | reverting recent db driver changes - won't install cleanly, won't update ↵friendica2012-04-121-1/+1
| | | | | | | | | | | | cleanly, and leaks DB credentials over the web if there's a connection problem
* | | settings: remove call to profile_load()Fabio Comuni2012-04-121-4/+0
| | |
* | | settings: move tabs to aside. add a new template "generic_links_widget.tpl"Fabio Comuni2012-04-121-45/+42
| |/ |/|
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-101-2/+2
|\ \
| * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: profile redir - goto correct profile page even if contact blocked, you just can't do anything. * master:
| * | | [fix] absolute links in docs and newmember.php; breaks sub-dir installsSimon L'nu2012-04-101-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | | visit "random profile" featurefriendica2012-04-102-1/+11
| |/ / |/| |
* | | profile redir - goto correct profile page even if contact blocked, you just ↵friendica2012-04-101-2/+4
|/ / | | | | | | can't do anything.
* | more backend work on mail2 followersfriendica2012-04-101-9/+54
| |
* | make editplain work everywherefriendica2012-04-102-5/+22
| |
* | move all fix_mce to one function so it can easily be undonefriendica2012-04-102-4/+2
| |
* | duplicate community postsfriendica2012-04-101-4/+4
| |