Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "disable feature setting for collections and make feature settings ↵ | marijus | 2014-01-26 | 2 | -10/+7 |
| | | | | | | for personal and new tab working." This reverts commit ed00301bb641d716e43876572be640f8252b9b05. | ||||
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-26 | 2 | -1/+3 |
|\ | |||||
| * | allow site defaults for enabled features | friendica | 2014-01-26 | 1 | -0/+2 |
| | | |||||
| * | don't prompt guests for a password if they're accessing an embedded public file. | friendica | 2014-01-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-01-26 | 3 | -111/+53 |
|\| | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 1 | -2/+3 |
| |\ | |||||
| | * | Typo | root | 2014-01-25 | 1 | -2/+3 |
| | | | |||||
| * | | some tweaks to items_fetch for the api | friendica | 2014-01-25 | 2 | -19/+21 |
| |/ | |||||
| * | Merge pull request #284 from cvogeley/master | friendica | 2014-01-25 | 2 | -24/+47 |
| |\ | | | | | | | API changes | ||||
| | * | Check user_info['self] in api user_timeline | Christian Vogeley | 2014-01-25 | 1 | -4/+13 |
| | | | |||||
| | * | remove wall restriction | Christian Vogeley | 2014-01-25 | 1 | -2/+1 |
| | | | | | | | | | | | | original didn’t have that | ||||
| | * | API My wall posts | Christian Vogeley | 2014-01-25 | 2 | -21/+33 |
| | | | |||||
| | * | Add $since_id to items_fetch | Christian Vogeley | 2014-01-22 | 1 | -2/+5 |
| | | | |||||
| * | | set session['my_address'] to current site in change channel, not primary hub ↵ | friendica | 2014-01-25 | 1 | -85/+1 |
| | | | | | | | | | | | | location. Also remove all the old Friendica-style authentication code. | ||||
* | | | disable feature setting for collections and make feature settings for ↵ | marijus | 2014-01-25 | 2 | -7/+10 |
|/ / | | | | | | | personal and new tab working. | ||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-23 | 1 | -2/+3 |
|\ \ | |||||
| * | | Ooops, included site specific hack | Thomas Willingham | 2014-01-24 | 1 | -6/+0 |
| | | | |||||
| * | | Make share previews a bit longer. We can't go any longer than this | Thomas Willingham | 2014-01-24 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | without suhosin starting to break things for channels with long names - this limit works with the channel with the longest name in the matrix today, but we may need to make this a pconfig anyway. | ||||
* | | | add zid to audio/video (again) | friendica | 2014-01-23 | 2 | -13/+50 |
|/ / | |||||
* | | display a somewhat more pleasant hovertip on qr codes | friendica | 2014-01-23 | 1 | -1/+1 |
| | | |||||
* | | fix marital partner linking | friendica | 2014-01-23 | 1 | -0/+10 |
| | | |||||
* | | missing filename in uploaded photos (we don't really use this, but we will ↵ | friendica | 2014-01-22 | 2 | -1/+2 |
| | | | | | | | | need to have a filename to export via DAV or API and the original filename would be the most likely choice). | ||||
* | | fix api/red/photos when supplied with an album name | friendica | 2014-01-22 | 1 | -1/+1 |
| | | |||||
* | | API: provide a link to photo albums in api/red/albums | friendica | 2014-01-22 | 1 | -1/+5 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-22 | 2 | -7/+10 |
|\ \ | |||||
| * \ | Merge pull request #279 from git-marijus/master | friendica | 2014-01-22 | 2 | -5/+5 |
| |\ \ | | | | | | | | | make network tabs regard selected group (collection) and vice versa | ||||
| | * | | update argument ?f= | marijus | 2014-01-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | make network tabs regard selected group (collection) and vice versa | marijus | 2014-01-22 | 2 | -4/+4 |
| | |/ | |||||
| * / | Give pages enough to construct a share button. | Thomas Willingham | 2014-01-22 | 1 | -2/+5 |
| |/ | |||||
* / | try to reduce the number of simulaneous deliveries of the same post when ↵ | friendica | 2014-01-22 | 2 | -15/+42 |
|/ | | | | dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy. | ||||
* | fix location of string file in Translations.md, fix some permissions and ↵ | friendica | 2014-01-21 | 1 | -15/+24 |
| | | | | owner vagueness (potential bugs) in profile_tabs() | ||||
* | seems you can't easily have a blank password for DAV guests, so the guest ↵ | friendica | 2014-01-21 | 1 | -0/+6 |
| | | | | password is now +++ | ||||
* | add the quota and volume size code | friendica | 2014-01-21 | 1 | -1/+29 |
| | |||||
* | fix the admin interface to pending registrations | friendica | 2014-01-21 | 1 | -2/+2 |
| | |||||
* | sql error | friendica | 2014-01-21 | 1 | -1/+1 |
| | |||||
* | added buttons to perform later hubloc actions | Michael Meer | 2014-01-20 | 1 | -1/+1 |
| | |||||
* | zidify audio/video links | friendica | 2014-01-20 | 1 | -7/+14 |
| | |||||
* | revert 26dfcecf054e1 | friendica | 2014-01-19 | 1 | -6/+2 |
| | |||||
* | Prevent zids messing up dav | Thomas Willingham | 2014-01-20 | 1 | -3/+5 |
| | |||||
* | Fix dav directory creation. | Thomas Willingham | 2014-01-20 | 1 | -2/+3 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-18 | 4 | -3/+16 |
|\ | |||||
| * | vcard widget needs to include Contact if it's not included from the module ↵ | Thomas Willingham | 2014-01-18 | 1 | -0/+1 |
| | | | | | | | | that calls it. | ||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-01-17 | 1 | -0/+9 |
| |\ | |||||
| | * | Merge pull request #274 from zzottel/master | friendica | 2014-01-17 | 1 | -0/+9 |
| | |\ | | | | | | | | | set jsAvailable cookie expire time to match PHPSESSID's | ||||
| | | * | set jsAvailable cookie expire time to match PHPSESSID's | zottel | 2014-01-17 | 1 | -0/+9 |
| | | | | |||||
| * | | | Missed these from git add...a year ago | Thomas Willingham | 2014-01-17 | 1 | -0/+2 |
| |/ / | |||||
| * / | Un-break dav auth. | Thomas Willingham | 2014-01-17 | 1 | -3/+4 |
| |/ | |||||
* / | some more bookmark infrastructure plus a doc update | friendica | 2014-01-18 | 1 | -9/+44 |
|/ | |||||
* | prevent zid's from reaching the DAV core code. | friendica | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-01-15 | 2 | -19/+53 |
|\ |