aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into trinidadfriendica2015-01-111-1/+1
|\
| * Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-1118-205/+253
| |\ | | | | | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
| * | Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-111-1/+1
| | | | | | | | | | | | subscription plan
* | | Merge branch 'master' into trinidadfriendica2015-01-101-2/+2
|\ \ \ | | |/ | |/|
| * | connection clone issuesfriendica2015-01-101-2/+2
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-102-1/+2
|\| |
| * | Fix unescaped image dataHabeas Codice2015-01-101-0/+1
| | |
| * | basic changes for file activitymarijus2015-01-091-1/+1
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-082-23/+28
|\| |
| * | Merge pull request #833 from pafcu/oneautocompleterpafcu2015-01-082-23/+28
| |\ \ | | | | | | | | Fixes for the new autocompletion
| | * | Fix saved searches on network page, fix caching mith multiple autocompletersStefan Parviainen2015-01-081-22/+26
| | | |
| | * | Honor requested count in navbar searchStefan Parviainen2015-01-081-1/+2
| | | |
* | | | Merge branch 'master' into trinidadfriendica2015-01-074-42/+22
|\| | |
| * | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-071-34/+14
| |\| |
| | * | Return results from acl.php in standard formStefan Parviainen2015-01-071-20/+0
| | | |
| | * | Make nav search use textcompleteStefan Parviainen2015-01-071-14/+14
| | | |
| * | | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-072-6/+6
| | | |
| * | | don't allow admin to delete the sys channel from the channel manage pagefriendica2015-01-061-2/+2
| |/ /
* | | begin the grand unification for 3.0. Start by splitting DAV into a web ↵friendica2015-01-062-27/+156
| | | | | | | | | | | | accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
* | | undo these bits of trinidad - we're going to do things differentlyfriendica2015-01-051-1/+1
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\| |
| * | the last checkin removed hostname from the address for autocomplete ↵friendica2015-01-041-1/+1
| | | | | | | | | | | | searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
* | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\| |
| * | only check the LHS of xchan_addr for autocomplete, don't match on the hostname.friendica2015-01-041-1/+1
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-042-76/+73
|\| |
| * | Merge pull request #816 from pafcu/aclRedMatrix2015-01-051-75/+72
| |\ \ | | | | | | | | Autocomplete improvements
| | * | TypoStefan Parviainen2015-01-041-3/+3
| | | |
| | * | Sorting of autocompleteStefan Parviainen2015-01-044-21/+56
| | |\ \
| | * | | Autocmplete suggestions for non-local users, also suggest from visited ↵Stefan Parviainen2015-01-041-75/+52
| | | | | | | | | | | | | | | | | | | | channel's connections
| * | | | Fix wrong requireStefan Parviainen2015-01-041-1/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+3
|\| | |
| * | | provide some info for buttonsmarijus2015-01-031-1/+3
| | | |
* | | | Merge branch 'master' into trinidadfriendica2015-01-021-9/+11
|\| | |
| * | | some work on the edit connection workflow explanation and connedit page. ↵friendica2015-01-021-9/+11
| | | | | | | | | | | | | | | | This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
* | | | Merge branch 'master' into trinidadfriendica2015-01-021-2/+5
|\| | |
| * | | Merge pull request #810 from pafcu/aclsortpafcu2015-01-021-2/+5
| |\ \ \ | | | | | | | | | | Sort acl results according to match position (only type='c' for now)
| | * | | Sort acl results according to match position (only type='c' for now)Stefan Parviainen2015-01-021-2/+5
| | |/ /
* | | | Merge branch 'master' into trinidadfriendica2015-01-011-7/+15
|\| | |
| * | | syntax issues (with some php versions?), unchecked intvalfriendica2015-01-011-7/+15
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-015-28/+30
|\| |
| * | fix shares that are processed with markdown (regression, this was pulled ↵friendica2015-01-011-3/+5
| | | | | | | | | | | | from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)
| * | Merge pull request #805 from pafcu/moretplRedMatrix2015-01-023-12/+5
| |\ \ | | | | | | | | Move some HTML out to templates
| | * | Use grouped select field for role selectionStefan Parviainen2015-01-012-8/+3
| | | |
| | * | Use grouped select field for timezone selectionStefan Parviainen2015-01-012-4/+2
| | | |
| * | | Checkboxify yesno-fields, but use CSS to show them as switches in RedbasicStefan Parviainen2015-01-012-13/+20
| |/ /
* | | Merge branch 'master' into trinidadfriendica2014-12-304-5/+21
|\| |
| * | Merge pull request #797 from anaqreon/imagelinkRedMatrix2014-12-311-1/+8
| |\ \ | | | | | | | | Imagelink
| | * | Added url tag around image for inserted linksAndrew Manning2014-12-301-1/+8
| | | |
| * | | Merge pull request #791 from pafcu/notificationsRedMatrix2014-12-311-0/+5
| |\ \ \ | | |/ / | |/| | Improved notifications
| | * | Make showing wall posts, intros and private messages under Notices optionalStefan Parviainen2014-12-301-0/+5
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 06:58:14 +0000