aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #51 from fabrixxm/settingsfriendica2013-05-107-19/+34
| |\
| | * add $db_port to .htconfig.php and $a->config['syste]['smarty3_folder'] for co...fabrixxm2013-05-107-19/+34
| |/
* / rev updatefriendica2013-05-102-457/+468
|/
* fix timeago on search items, and bring back app display for wall items - whic...friendica2013-05-093-8/+8
* more jquery migrationfriendica2013-05-091-2/+2
* get rid of jquery.browser warnings by removing msie hacks in two places, live...friendica2013-05-093-4/+5
* get search page working with live-update and endless scroll, still not perfec...friendica2013-05-097-33/+107
* Merge https://github.com/friendica/red into zpullfriendica2013-05-08370-7781/+3049
|\
| * Merge pull request #50 from fabrixxm/newtemplatesystemfriendica2013-05-08370-7781/+3049
| |\
| | * remove "internal" templates, use "tpl/" folder for smarty3 templates,fabrixxm2013-05-08364-7713/+2868
| | * fix internalfabrixxm2013-05-081-2/+5
| | * use smarty3 as default template engine. add pluggable template systemfabrixxm2013-05-087-68/+178
| |/
* / small updatesfriendica2013-05-087-11/+11
|/
* mofriendica2013-05-071-6/+4
* mofriendica2013-05-071-1/+4
* mo' readmefriendica2013-05-071-4/+5
* capitalisefriendica2013-05-071-1/+1
* more readme stufffriendica2013-05-071-7/+12
* image link issuefriendica2013-05-071-1/+1
* first cut at a new readmefriendica2013-05-074-8/+28
* fix prettyphoto pathfriendica2013-05-072-2/+2
* add driver param to output queue so we know what protocol to use when faced w...friendica2013-05-063-2/+12
* fixesfriendica2013-05-063-7/+6
* photo driver issue when updating contact photos - old class structure used in...friendica2013-05-053-5/+7
* fix admin assignfriendica2013-05-051-2/+2
* email notification content privacy by default (unless it's public content)friendica2013-05-051-0/+24
* minor fixes related to postgres developmentfriendica2013-05-057-1068/+1068
* incorrect comparison operatorfriendica2013-05-021-1/+1
* members_of_group() output not entirely correctfriendica2013-05-022-2/+5
* smarter handling of js_upload source paramfriendica2013-05-024-2/+5
* change plugin_install to plugin_load, etc.friendica2013-05-013-45/+80
* change the way profiles are importedfriendica2013-04-302-51/+70
* Merge branch 'photothread'friendica2013-04-291-100/+18
|\
| * Merge branch 'master' into photothreadfriendica2013-04-16100-960/+1773
| |\
| * | some work on updating photo threads for Redfriendica2013-04-081-100/+18
* | | don't try and load an empty string as a photofriendica2013-04-292-1/+8
* | | fix broken profile syncingfriendica2013-04-291-2/+4
* | | add some debugging - update times are changing much faster than they're suppo...friendica2013-04-292-1/+8
* | | more directory sync stufffriendica2013-04-281-11/+20
* | | Merge https://github.com/friendica/red into zpullfriendica2013-04-281-11/+0
|\ \ \
| * | | Redundant CSSThomas Willingham2013-04-271-11/+0
* | | | port superblock core code (except Red will use an xchan instead of a URL)friendica2013-04-282-1/+44
|/ / /
* | | doc updatefriendica2013-04-26109-915/+3972
* | | rev updatefriendica2013-04-262-90/+89
* | | Merge pull request #49 from beardy-unixer/masterfriendica2013-04-2669-19/+4116
|\ \ \
| * | | Unbork smarty templates.Thomas Willingham2013-04-263-10/+5
| * | | Stupid mistakeThomas Willingham2013-04-261-0/+2
| * | | ColorboxThomas Willingham2013-04-2672-25/+4125
|/ / /
* | | photo driver abstractionfriendica2013-04-2515-471/+436
* | | odds and ends in prepearation for photo abstraction, plus red-to-friendica addonfriendica2013-04-256-37/+154