rabuzarus
01b02dbcaa
Merge develop into 1404_reworked_autocomplete
...
Conflicts:
include/text.php
view/templates/head.tpl
view/theme/duepuntozero/style.css
view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
fabrixxm
0664ace260
Fix ignore doxigen output in .gitignore
2015-12-28 10:23:06 +01:00
Michael Vogel
cd41746597
Moved the "test" folder to "local"
2015-01-25 01:09:47 +01:00
Michael Vogel
cb9196f6d6
Issue 1197: New hook for "oembed_fetch_url"
2015-01-25 00:58:51 +01:00
tobiasd
64946972b2
Merge pull request #1028 from tugelbend/master
...
Vagrant configuration to instantiate development boxes easily
2014-06-22 09:36:25 +02:00
Hauke Altmann
c23de3a64e
added vagrant configuration for running a friendica development instance
2014-06-20 16:05:44 +02:00
Michael Vogel
a6742d3db6
Repeated messages to Diaspora now contain a link to the original content at the bottom of the message.
2014-05-11 22:07:37 +02:00
Fabrixxm
2111f750fb
quattro: show notification number in favicon
2013-05-31 06:18:59 -04:00
Michael Vogel
37389795b0
added robots.txt to the igmnored files
2013-02-17 18:46:39 +01:00
Michael Vogel
348f43157a
Vier: Some templates were missing
2012-12-30 22:58:05 +01:00
Fabrixxm
1a3a5ee8d9
moveme: first successful relocated user
2012-10-31 17:13:45 +01:00
Christian Vogeley
cf2016e1a6
ignore OSX .DS_Store files
2012-09-17 23:11:42 +02:00
Christian Vogeley
c024ed601e
Remove and ignore .DS_Store
2012-09-17 23:03:34 +02:00
Thomas Willingham
dbdc4bcb67
Gitignore seems to have been overwritten with somebody's personal copy - put the old one back.
2012-09-17 14:52:26 +01:00
pixelroot
9f7fbbdee3
modified: view/theme/smoothly/style.css
2012-09-07 16:32:20 +02:00
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
