Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #779 from pafcu/audio | pafcu | 2014-12-28 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Make spaces work in [audio] and [video]. Fixes #774 | |||||
| * | | | | | Fix typo | Stefan Parviainen | 2014-12-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Make spaces work in [audio] and [video]. Fixes #774 | Stefan Parviainen | 2014-12-28 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | issue #777, make photo cache time configurable, read the comments. | friendica | 2014-12-27 | 2 | -4/+17 | |
| | | | | | ||||||
* | | | | | revup | friendica | 2014-12-27 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | some more mime-type -> icon for filebrowser | marijus | 2014-12-27 | 1 | -2/+13 | |
|/ / / / | ||||||
* | | | | more work on files | marijus | 2014-12-27 | 5 | -48/+96 | |
| | | | | ||||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-26 | 24 | -5/+1 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #767 from pafcu/apps | RedMatrix | 2014-12-27 | 22 | -0/+0 | |
| |\ \ \ \ | | | |/ / | | |/| | | Use Tango-based app icons | |||||
| | * | | | Make poke icon hand non-transparent | Stefan Parviainen | 2014-12-26 | 1 | -0/+0 | |
| | | | | | ||||||
| | * | | | Use Tango-based app icons | Stefan Parviainen | 2014-12-26 | 22 | -0/+0 | |
| | |/ / | ||||||
| * | | | Merge pull request #766 from pafcu/autocomplete | RedMatrix | 2014-12-27 | 1 | -2/+1 | |
| |\ \ \ | | |/ / | |/| | | Fix regex in contact autocomplete | |||||
| | * | | Fix regex in contact autocomplete | Stefan Parviainen | 2014-12-24 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Cruft left over from stuff we don't have anymore. | Thomas Willingham | 2014-12-26 | 1 | -3/+0 | |
| | | | | ||||||
* | | | | doc update | friendica | 2014-12-26 | 35 | -655/+732 | |
| | | | | ||||||
* | | | | change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that ↵ | friendica | 2014-12-26 | 1 | -53/+53 | |
|/ / / | | | | | | | | | | individual connections can be revoked instead of this being inherited and un-changeable | |||||
* | | | document the new inline map codes | friendica | 2014-12-23 | 1 | -0/+8 | |
| | | | ||||||
* | | | cleanup bb2diaspora - was getting crufty | friendica | 2014-12-23 | 2 | -21/+1 | |
| | | | ||||||
* | | | diaspora formatting improvements (getting too many xx-large posts) | friendica | 2014-12-22 | 1 | -4/+6 | |
| | | | ||||||
* | | | some improvements in api direct messages | friendica | 2014-12-22 | 1 | -4/+9 | |
| | | | ||||||
* | | | direct messages in api have some issues, not properly ported from friendica ↵ | friendica | 2014-12-22 | 2 | -10/+12 | |
| | | | | | | | | | | | | | | | | | | originally. Here's a start. I think at best they may return encrypted gibberish currently, but let's work through them one at a time. | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-22 | 10 | -42/+60 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #760 from pafcu/apps | RedMatrix | 2014-12-23 | 10 | -42/+60 | |
| |\ \ \ | | | | | | | | | | | Some apps changes | |||||
| | * | | | Move app icon centering to style.css | Stefan Parviainen | 2014-12-22 | 2 | -1/+9 | |
| | | | | | ||||||
| | * | | | Option to check that a random profile works before returning it | Stefan Parviainen | 2014-12-22 | 2 | -24/+46 | |
| | | | | | ||||||
| | * | | | Remove unused apps.tpl | Stefan Parviainen | 2014-12-22 | 1 | -11/+0 | |
| | | | | | ||||||
| | * | | | Center app names | Stefan Parviainen | 2014-12-22 | 2 | -3/+2 | |
| | | | | | ||||||
| | * | | | Rename some apps, fix webpages requires | Stefan Parviainen | 2014-12-22 | 5 | -5/+5 | |
| | | | | | ||||||
* | | | | | add example to script | friendica | 2014-12-22 | 1 | -1/+59 | |
|/ / / / | ||||||
* | | | | basic ical parser | friendica | 2014-12-22 | 1 | -0/+321 | |
| | | | | ||||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-22 | 4 | -85/+64 | |
|\ \ \ \ | ||||||
| * | | | | Merge pull request #759 from pafcu/apps | RedMatrix | 2014-12-23 | 1 | -54/+59 | |
| |\| | | | | | | | | | | | | | Fix feature check in apps (missing parenthesis), allow multiple requires... | |||||
| | * | | | Fix feature check in apps (missing parenthesis), allow multiple requires ↵ | Stefan Parviainen | 2014-12-22 | 1 | -54/+59 | |
| | | | | | | | | | | | | | | | | | | | | (comma separated) | |||||
| * | | | | Merge pull request #758 from pafcu/autocomplete | RedMatrix | 2014-12-23 | 2 | -31/+4 | |
| |\ \ \ \ | | | |/ / | | |/| | | Show autocomplete taggable with special color | |||||
| | * | | | Show autocomplete taggable with special color | Stefan Parviainen | 2014-12-22 | 2 | -31/+4 | |
| | |/ / | ||||||
| * / / | Pass sitename to apps | Thomas Willingham | 2014-12-22 | 1 | -0/+1 | |
| |/ / | ||||||
* / / | revup | friendica | 2014-12-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | provide last successful poll run time (using relative time) in siteinfo so ↵ | friendica | 2014-12-21 | 5 | -7/+21 | |
| | | | | | | | | that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-21 | 21 | -103/+1708 | |
|\ \ | ||||||
| * \ | Merge pull request #757 from git-marijus/master | RedMatrix | 2014-12-22 | 10 | -63/+75 | |
| |\ \ | | | | | | | | | files: make mod/filestorage.php load via ajax and some design work. work... | |||||
| | * | | fix button visibility | marijus | 2014-12-21 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | forgot to git add files | marijus | 2014-12-21 | 2 | -0/+15 | |
| | | | | ||||||
| | * | | files: make mod/filestorage.php load via ajax and some design work. work in ↵ | marijus | 2014-12-21 | 8 | -63/+57 | |
| | | | | | | | | | | | | | | | | progress... | |||||
| * | | | Merge pull request #756 from encyclomundi/master | RedMatrix | 2014-12-22 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | change address book to connections | |||||
| | * | | | change address book to connections | Charles | 2014-12-21 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #755 from pafcu/docfix | RedMatrix | 2014-12-22 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | Fix issue #752 | |||||
| | * | | | | Fix issue #752 | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #754 from pafcu/categoryinput | RedMatrix | 2014-12-22 | 9 | -36/+1629 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fancy categories input in editor | |||||
| | * | | | | | Add bootstrap-tagsinput library | Stefan Parviainen | 2014-12-21 | 5 | -0/+1589 | |
| | | | | | | | ||||||
| | * | | | | | Fancy categories input with bootstrap-tagsinput | Stefan Parviainen | 2014-12-21 | 4 | -36/+40 | |
| | |/ / / / |