Michael Vogel
2e9d233367
Merge remote-tracking branch 'upstream/master' into develop
...
Conflicts:
boot.php
2016-07-21 22:48:34 +02:00
Ben Roberts
22de27327c
recreate fix for #2617 on correct branch
2016-06-18 08:16:09 -04:00
Christian González
545e4f645e
really uncomment the lines.
2016-01-31 16:20:06 +01:00
Christian González
e80d5a7f23
additional blank line
2016-01-30 23:22:40 +01:00
Christian González
2ca9d011fe
add simple option for HTTPS in .htaccess
...
people have it easier to just uncomment 2 lines if they want such an important feature
2016-01-30 23:21:03 +01:00
Michael Vogel
a333036f00
API: The command "users/search" is now supported.
2014-09-07 07:32:09 +02:00
pixelroot
c3be0e9295
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2014-01-27 14:36:38 +01:00
Zach Prezkuta
a089a89478
small twitter improvements
2012-09-06 17:31:05 -06:00
Domovoy
2b51e91414
Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot
2012-09-02 23:00:58 +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
cea7ca1df4
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
boot.php
database.sql
include/template_processor.php
update.php
2012-03-22 12:50:02 +01:00
Alexander Kampmann
29900febb3
removed problem from previous commit
2012-03-22 12:45:11 +01:00
friendica
be4e4dfb0d
turn indexes back off (this is from an errant checkin a year or more ago)
2012-03-15 20:07:30 -07:00
Alexander Kampmann
2e3116a11e
added library and include to .htaccess
2012-03-08 17:46:40 +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
9254c13f62
reverted rewrite base
2011-10-17 17:40:00 +02:00
Fabio Comuni
de44072172
works on login form
2011-10-17 16:53:59 +02:00
Friendika
e3e27458f8
removed another local line
2011-07-06 04:14:17 -07:00
Friendika
e3f061382b
removed local testing statement from .htaccess
2011-07-06 03:52:51 -07:00
Fabio Comuni
e7834e60f8
Update settings page to use field templates.
...
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
2011-07-06 12:10:00 +02:00
Friendika
f7964efa52
revisit friend suggestion structures
2011-06-26 17:57:23 -07:00
Friendika
b56e00c7c5
api post sort of working - output status,user need to be swapped
2011-06-19 20:13:24 -07:00
Friendika
ded449f697
ostatus doesn't accept activitystreams stop-follow verb or multiple verbs, insists on single ostatus unfollow #non-standard
2011-04-05 23:06:03 -07:00
Friendika
18da7efa27
undo last commit
2011-03-30 05:22:25 -07:00
Friendika
89df2b19ce
increase suhosin $_GET length limit
2011-03-30 05:10:22 -07:00
Friendika
64628c800d
provide "return home" key
2011-01-04 05:06:10 -08:00
Friendika
76b5e984e1
that didn't work - we need to be able to see .well-known/host-meta
2010-11-09 17:06:54 -08:00
Friendika
c50f491c3d
improved lockout of version control directories from browsing
2010-11-09 14:10:33 -08:00
Friendika
b4c7b6a77a
prevent repository leakage on the web
2010-11-09 13:59:22 -08:00
Mike Macgirvin
66a6fd8df0
more instrumentation
2010-10-06 18:14:11 -07:00
Mike Macgirvin
04e65823d7
more post branch bug fixes
2010-08-10 05:58:22 -07:00
Mike Macgirvin
72b20a6eb1
progress on photos
2010-08-05 21:15:24 -07:00
Mike Macgirvin
6348e70daa
Initial checkin
2010-07-01 16:48:07 -07:00
