aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-113-2/+28
* mergeChristian Vogeley2014-12-277-757/+18
* some more mime-type -> icon for filebrowsermarijus2014-12-271-2/+13
* more work on filesmarijus2014-12-275-48/+96
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2624-5/+1
|\
| * Merge pull request #767 from pafcu/appsRedMatrix2014-12-2722-0/+0
| |\
| | * Make poke icon hand non-transparentStefan Parviainen2014-12-261-0/+0
| | * Use Tango-based app iconsStefan Parviainen2014-12-2622-0/+0
| * | Merge pull request #766 from pafcu/autocompleteRedMatrix2014-12-271-2/+1
| |\ \ | | |/ | |/|
| | * Fix regex in contact autocompleteStefan Parviainen2014-12-241-2/+1
| * | Cruft left over from stuff we don't have anymore.Thomas Willingham2014-12-261-3/+0
* | | doc updatefriendica2014-12-2635-655/+732
* | | change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that individua...friendica2014-12-261-53/+53
|/ /
* | document the new inline map codesfriendica2014-12-231-0/+8
* | cleanup bb2diaspora - was getting cruftyfriendica2014-12-232-21/+1
* | diaspora formatting improvements (getting too many xx-large posts)friendica2014-12-221-4/+6
* | some improvements in api direct messagesfriendica2014-12-221-4/+9
* | direct messages in api have some issues, not properly ported from friendica o...friendica2014-12-222-10/+12
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2210-42/+60
|\ \
| * \ Merge pull request #760 from pafcu/appsRedMatrix2014-12-2310-42/+60
| |\ \
| | * | Move app icon centering to style.cssStefan Parviainen2014-12-222-1/+9
| | * | Option to check that a random profile works before returning itStefan Parviainen2014-12-222-24/+46
| | * | Remove unused apps.tplStefan Parviainen2014-12-221-11/+0
| | * | Center app namesStefan Parviainen2014-12-222-3/+2
| | * | Rename some apps, fix webpages requiresStefan Parviainen2014-12-225-5/+5
* | | | add example to scriptfriendica2014-12-221-1/+59
|/ / /
* | | basic ical parserfriendica2014-12-221-0/+321
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-224-85/+64
|\ \ \
| * | | Merge pull request #759 from pafcu/appsRedMatrix2014-12-231-54/+59
| |\| |
| | * | Fix feature check in apps (missing parenthesis), allow multiple requires (com...Stefan Parviainen2014-12-221-54/+59
| * | | Merge pull request #758 from pafcu/autocompleteRedMatrix2014-12-232-31/+4
| |\ \ \ | | | |/ | | |/|
| | * | Show autocomplete taggable with special colorStefan Parviainen2014-12-222-31/+4
| | |/
| * / Pass sitename to appsThomas Willingham2014-12-221-0/+1
| |/
* / revupfriendica2014-12-221-1/+1
|/
* provide last successful poll run time (using relative time) in siteinfo so th...friendica2014-12-215-7/+21
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2121-103/+1708
|\
| * Merge pull request #757 from git-marijus/masterRedMatrix2014-12-2210-63/+75
| |\
| | * fix button visibilitymarijus2014-12-211-3/+6
| | * forgot to git add filesmarijus2014-12-212-0/+15
| | * files: make mod/filestorage.php load via ajax and some design work. work in p...marijus2014-12-218-63/+57
| * | Merge pull request #756 from encyclomundi/masterRedMatrix2014-12-221-1/+1
| |\ \
| | * | change address book to connectionsCharles2014-12-211-1/+1
| * | | Merge pull request #755 from pafcu/docfixRedMatrix2014-12-221-1/+1
| |\ \ \
| | * | | Fix issue #752Stefan Parviainen2014-12-211-1/+1
| * | | | Merge pull request #754 from pafcu/categoryinputRedMatrix2014-12-229-36/+1629
| |\ \ \ \
| | * | | | Add bootstrap-tagsinput libraryStefan Parviainen2014-12-215-0/+1589
| | * | | | Fancy categories input with bootstrap-tagsinputStefan Parviainen2014-12-214-36/+40
| | |/ / /
| * | | | Merge pull request #753 from pafcu/autocompleteRedMatrix2014-12-221-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix whitespace disappearing at the beginning of completed smilyStefan Parviainen2014-12-211-1/+1
| | * | | Correct domain for smily requestsStefan Parviainen2014-12-211-1/+1