aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* open contact edit in same windowfriendica2012-04-151-1/+1
|
* Merge pull request #234 from copyninja/masterfriendica2012-04-142-0/+0
|\ | | | | Executable permisson removal on files which are not elf/script
| * Another bunch of executable permission removalVasudev Kamath2012-04-142-0/+0
| |
* | string fix: typo. slow down scroll to top in dispysSimon L'nu2012-04-141-2/+2
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | bug #372 - category feedsfriendica2012-04-141-0/+10
|/
* one morefriendica2012-04-131-1/+1
|
* additional marital status selectorsfriendica2012-04-131-1/+1
|
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-04-132-1/+27
|\
| * stray debug statements, forgot to filter pending contactsfriendica2012-04-121-5/+5
| |
| * bug #369 - show contacts who are not in any groupsfriendica2012-04-122-4/+19
| |
| * query to find un-grouped contactsfriendica2012-04-121-1/+12
| |
* | move html out of lang_selector() and new template lang_selector.tplFabio Comuni2012-04-131-9/+16
| |
* | validate_url allow naked subdomain if is "localhost"Fabio Comuni2012-04-131-3/+4
|/
* reverting recent db driver changes - won't install cleanly, won't update ↵friendica2012-04-121-274/+186
| | | | cleanly, and leaks DB credentials over the web if there's a connection problem
* table cleanupfriendica2012-04-122-0/+19
|
* visit "random profile" featurefriendica2012-04-102-0/+10
|
* cleanup photo menusfriendica2012-04-102-11/+11
|
* more backend work on mail2 followersfriendica2012-04-101-0/+3
|
* fix_mce_lf on profilesfriendica2012-04-101-0/+5
|
* set default on get_avatarfriendica2012-04-101-1/+8
|
* Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pullfriendica2012-04-102-13/+11
|\
| * Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-091-8/+6
| | | | | | | | | | 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?
| * Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-092-5/+5
| | | | | | | | | | 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.
* | Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-091-0/+10
|\|
| * more sane defaults datetime_convertfriendica2012-04-081-3/+6
| |
| * fix empty string timezonefriendica2012-04-081-0/+7
| |
* | fixed some typosAlexander Kampmann2012-04-091-4/+4
| |
* | made exceptions from the db optionalAlexander Kampmann2012-04-091-2/+30
| | | | | | set address for updae mails correctly
* | added exceptions to dba classAlexander Kampmann2012-04-091-188/+248
|/ | | | | | | | | added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email
* API: API is now enhanced. mentions, repeat and destroy now works.Michael Vogel2012-04-081-9/+142
|
* Merge commit 'upstream/master'Michael Vogel2012-04-0750-2/+14
|\
| * ignore utf8 offset error for unit testsfriendica2012-04-071-1/+3
| |
| * some work on testsfriendica2012-04-071-1/+1
| |
| * ignore removed pluginsfriendica2012-04-061-2/+9
| |
| * fix messed up config tables w/ duplicate entriesfriendica2012-04-061-1/+1
| |
| * revert config changes, we're getting duplicate keysfriendica2012-04-061-151/+147
| |
| * Merge branch 'pull'friendica2012-04-0550-147/+151
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0555-150/+837
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php
| | * | added index to config and pconfig tableAlexander Kampmann2012-04-051-152/+154
| | | | | | | | | | | | | | | | changed config.php to use REPLACE instead of INSERT, this removes one db hit.
| * | | pass autoname(0) testfriendica2012-04-051-0/+3
| | |/ | |/|
* | | Merge commit 'upstream/master'Michael Vogel2012-04-065-0/+82
|\| |
| * | also block outboundfriendica2012-04-041-0/+5
| | |
| * | log disabled requestsfriendica2012-04-041-2/+6
| | |
| * | fix config storage of booleansfriendica2012-04-041-0/+1
| | |
| * | bug: diaspora_enabled setting turns it on but doesn't fully turn it off.friendica2012-04-041-0/+8
| | |
| * | make contact ssl_policy change a function since it is used in a few placesfriendica2012-04-023-86/+50
| | |
| * | more ssl policy fixes and prevent delivery to soapbox when using local deliveryfriendica2012-04-022-0/+100
| | |
* | | Merge commit 'upstream/master'Michael Vogel2012-04-025-2/+162
|\| |
| * | remove zrl from query stringfriendica2012-04-021-0/+3
| | |
| * | catch a couple more Oo smiliesfriendica2012-04-011-0/+4
| | |