aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-262-1/+3
|\
| * allow site defaults for enabled featuresfriendica2014-01-261-0/+2
| * don't prompt guests for a password if they're accessing an embedded public file.friendica2014-01-261-1/+1
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-263-111/+53
|\|
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-251-2/+3
| |\
| | * Typoroot2014-01-251-2/+3
| * | some tweaks to items_fetch for the apifriendica2014-01-252-19/+21
| |/
| * Merge pull request #284 from cvogeley/masterfriendica2014-01-252-24/+47
| |\
| | * Check user_info['self] in api user_timelineChristian Vogeley2014-01-251-4/+13
| | * remove wall restrictionChristian Vogeley2014-01-251-2/+1
| | * API My wall postsChristian Vogeley2014-01-252-21/+33
| | * Add $since_id to items_fetchChristian Vogeley2014-01-221-2/+5
| * | set session['my_address'] to current site in change channel, not primary hub ...friendica2014-01-251-85/+1
* | | disable feature setting for collections and make feature settings for persona...marijus2014-01-252-7/+10
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-2/+3
|\ \
| * | Ooops, included site specific hackThomas Willingham2014-01-241-6/+0
| * | Make share previews a bit longer. We can't go any longer than thisThomas Willingham2014-01-241-2/+9
* | | add zid to audio/video (again)friendica2014-01-232-13/+50
|/ /
* | display a somewhat more pleasant hovertip on qr codesfriendica2014-01-231-1/+1
* | fix marital partner linkingfriendica2014-01-231-0/+10
* | missing filename in uploaded photos (we don't really use this, but we will ne...friendica2014-01-222-1/+2
* | fix api/red/photos when supplied with an album namefriendica2014-01-221-1/+1
* | API: provide a link to photo albums in api/red/albumsfriendica2014-01-221-1/+5
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-222-7/+10
|\ \
| * \ Merge pull request #279 from git-marijus/masterfriendica2014-01-222-5/+5
| |\ \
| | * | update argument ?f=marijus2014-01-221-2/+2
| | * | make network tabs regard selected group (collection) and vice versamarijus2014-01-222-4/+4
| | |/
| * / Give pages enough to construct a share button.Thomas Willingham2014-01-221-2/+5
| |/
* / try to reduce the number of simulaneous deliveries of the same post when deal...friendica2014-01-222-15/+42
|/
* fix location of string file in Translations.md, fix some permissions and owne...friendica2014-01-211-15/+24
* seems you can't easily have a blank password for DAV guests, so the guest pas...friendica2014-01-211-0/+6
* add the quota and volume size codefriendica2014-01-211-1/+29
* fix the admin interface to pending registrationsfriendica2014-01-211-2/+2
* sql errorfriendica2014-01-211-1/+1
* added buttons to perform later hubloc actionsMichael Meer2014-01-201-1/+1
* zidify audio/video linksfriendica2014-01-201-7/+14
* revert 26dfcecf054e1friendica2014-01-191-6/+2
* Prevent zids messing up davThomas Willingham2014-01-201-3/+5
* Fix dav directory creation.Thomas Willingham2014-01-201-2/+3
* Merge https://github.com/friendica/red into zpullfriendica2014-01-184-3/+16
|\
| * vcard widget needs to include Contact if it's not included from the module th...Thomas Willingham2014-01-181-0/+1
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-01-171-0/+9
| |\
| | * Merge pull request #274 from zzottel/masterfriendica2014-01-171-0/+9
| | |\
| | | * set jsAvailable cookie expire time to match PHPSESSID'szottel2014-01-171-0/+9
| * | | Missed these from git add...a year agoThomas Willingham2014-01-171-0/+2
| |/ /
| * / Un-break dav auth.Thomas Willingham2014-01-171-3/+4
| |/
* / some more bookmark infrastructure plus a doc updatefriendica2014-01-181-9/+44
|/
* prevent zid's from reaching the DAV core code.friendica2014-01-161-1/+1
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-01-152-19/+53
|\
| * fix folder timestamps and change them when a child DAV file is written tofriendica2014-01-151-5/+31