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
Alexander Kampmann
fbd7e8f8ba
excludes reports from git
2012-03-08 17:44:57 +01:00
Alexander Kampmann
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
Fabio Comuni
3dca29b3d5
port old themes
2011-09-27 10:19:32 +02:00
Friendika
44a72f08e9
addon is not managed by our repository any more
2011-09-25 02:19:59 -07:00
Friendika
372c75ee68
how the heck did favicon get into the repo? Gone now...
2011-06-28 21:27:00 -07:00
Friendika
2bc4e24da2
ignore local merge script
2011-06-23 16:10:36 -07:00
Friendika
158b65894a
initial checkin mailbox reading functions - lots more to do
2011-04-15 19:16:37 -07:00
Friendika
a41b4c6e67
cleanup untracked files
2011-03-29 17:46:40 -07:00
Friendika
7b9dff1db7
automated versioning
2011-03-09 16:57:22 -08:00
Mike Macgirvin
399b6828f6
remove debugging on public repository
2010-09-21 17:16:34 -07:00
Mike Macgirvin
db89a1eb44
prepare for open source server release
2010-09-21 16:01:19 -07:00
Mike Macgirvin
03664327ce
added local push
2010-08-12 15:49:06 -07:00
Mike Macgirvin
88bfe21bea
first cut at ajax photo upload
2010-07-22 20:22:03 -07:00
Mike Macgirvin
466267fbb5
lotsoflittlestuff
2010-07-20 05:21:19 -07:00
Mike Macgirvin
6348e70daa
Initial checkin
2010-07-01 16:48:07 -07:00