aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that ↵friendica2014-12-261-53/+53
| | | | individual connections can be revoked instead of this being inherited and un-changeable
* 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 ↵friendica2014-12-222-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_mergefriendica2014-12-2210-42/+60
|\
| * Merge pull request #760 from pafcu/appsRedMatrix2014-12-2310-42/+60
| |\ | | | | | | Some apps changes
| | * 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...
| | * Fix feature check in apps (missing parenthesis), allow multiple requires ↵Stefan Parviainen2014-12-221-54/+59
| | | | | | | | | | | | (comma separated)
| * | Merge pull request #758 from pafcu/autocompleteRedMatrix2014-12-232-31/+4
| |\ \ | | | | | | | | Show autocomplete taggable with special color
| | * | 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 ↵friendica2014-12-215-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_mergefriendica2014-12-2121-103/+1708
|\
| * Merge pull request #757 from git-marijus/masterRedMatrix2014-12-2210-63/+75
| |\ | | | | | | files: make mod/filestorage.php load via ajax and some design work. work...
| | * 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 ↵marijus2014-12-218-63/+57
| | | | | | | | | | | | progress...
| * | Merge pull request #756 from encyclomundi/masterRedMatrix2014-12-221-1/+1
| |\ \ | | | | | | | | change address book to connections
| | * | change address book to connectionsCharles2014-12-211-1/+1
| | | |
| * | | Merge pull request #755 from pafcu/docfixRedMatrix2014-12-221-1/+1
| |\ \ \ | | | | | | | | | | Fix issue #752
| | * | | Fix issue #752Stefan Parviainen2014-12-211-1/+1
| | | | |
| * | | | Merge pull request #754 from pafcu/categoryinputRedMatrix2014-12-229-36/+1629
| |\ \ \ \ | | | | | | | | | | | | Fancy categories input in editor
| | * | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | | Correct domain for smily requests
| | * | | Fix whitespace disappearing at the beginning of completed smilyStefan Parviainen2014-12-211-1/+1
| | | | |
| | * | | Correct domain for smily requestsStefan Parviainen2014-12-211-1/+1
| | | | |
* | | | | fix double encoding of homepage in profile activity - not as ↵friendica2014-12-214-3/+8
|/ / / / | | | | | | | | | | | | straight-forward as it looked
* | / / Merge pull request #751 from pafcu/autocompleteRedMatrix2014-12-211-1/+9
|\| | | | |/ / |/| | Autocomplete smilies
| * | Merge remote-tracking branch 'upstream/master' into autocompleteStefan Parviainen2014-12-2110-43/+75
| |\ \ | |/ / |/| |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2013-218/+1210
|\ \ \
| * \ \ Merge pull request #749 from pafcu/hijackingdocfixRedMatrix2014-12-211-1/+1
| |\ \ \ | | | | | | | | | | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (corr...
| | * | | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct)Stefan Parviainen2014-12-201-1/+1
| | | | |
| * | | | Merge pull request #748 from pafcu/smilyjsonRedMatrix2014-12-212-32/+51
| |\ \ \ \ | | | | | | | | | | | | Access list of smilies over JSON
| | * | | | Access list of smilies over JSONStefan Parviainen2014-12-202-32/+51
| | | | | |
| * | | | | Merge pull request #747 from pafcu/autocompleteRedMatrix2014-12-214-176/+1136
| |\ \ \ \ \ | | | | | | | | | | | | | | Better contact autocomplete based on jquery-textcomplete
| * | | | | | Oopsie in GermanThomas Willingham2014-12-201-1/+1
| | | | | | |
| * | | | | | Doco - fix some tags.Thomas Willingham2014-12-205-9/+12
| | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-2075-3688/+4234
| |\ \ \ \ \ | | | |/ / / | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:19:36 +0000