aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* merge red into hubzillaMario Vavti2017-07-0335-188/+1156
|\
| * diaspora hcard wasn't being renderedzotlabs2017-06-281-2/+2
| * missing space in nav tplzotlabs2017-06-282-2/+2
| * provide a gender icon on the profile sidebar within reasonzotlabs2017-06-271-1/+1
| * provide more comprehensible information on the admin summary pagezotlabs2017-06-261-2/+2
| * minor usability enhancements with the connections list - label the edit icon ...zotlabs2017-06-252-2/+6
| * cdav migration to corezotlabs2017-06-222-0/+125
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-203-12/+10
| |\
| * | allow moderated comments like wordpress if permissions are compatiblezotlabs2017-06-183-3/+17
| * | brainstorming a comment moderation systemzotlabs2017-06-171-0/+7
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-142-0/+24
| |\ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-112-102/+106
| |\ \ \
| * | | | clean up the warnings about connections on unclonable networkszotlabs2017-06-091-2/+3
| * | | | put unreachable federated connections in the archived tab of the connections ...zotlabs2017-06-081-0/+5
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-078-38/+50
| |\ \ \ \
| * | | | | active nav-link was white on whitezotlabs2017-05-311-0/+4
| * | | | | remove text_highlight css load from corezotlabs2017-05-301-1/+0
| * | | | | move disapora xrd stuff to pluginzotlabs2017-05-302-7/+1
| * | | | | remove server role from language configszotlabs2017-05-2910-78/+0
| * | | | | more deprecate server_rolezotlabs2017-05-292-6/+1
| * | | | | start deprecation of server_rolezotlabs2017-05-292-9/+3
| * | | | | hubzilla issue #795zotlabs2017-05-261-1/+1
| * | | | | apporder style improvement and add to nav menu, also add language awareness t...zotlabs2017-05-222-2/+4
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-223-12/+18
| |\ \ \ \ \
| * | | | | | some issues with the app order template logiczotlabs2017-05-211-5/+6
| * | | | | | apporder module and all the associated backend stuff to make it work; probabl...zotlabs2017-05-212-1/+13
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-161-6/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-105-11074/+10557
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-093-545/+565
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-055-7/+54
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | more cleanupzotlabs2017-05-021-0/+3
| * | | | | | | | | | profile_sidebar hook ignored the updated html contentzotlabs2017-05-021-69/+0
| * | | | | | | | | | Revert "move theme specific files to theme dir"zotlabs2017-05-02277-0/+0
| * | | | | | | | | | move theme specific files to theme dirzotlabs2017-05-01277-0/+0
| * | | | | | | | | | add cdav fileszotlabs2017-05-014-0/+998
| * | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-261-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | provide a broken feed for services which require a broken feedzotlabs2017-04-251-5/+2
| * | | | | | | | | | | give the item_obscured flag a new lease on life by using it to designate thir...zotlabs2017-04-181-0/+3
| * | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-187-7/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-177-11230/+10653
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-073-11094/+10565
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix from downstreamzotlabs2017-04-071-1/+1
| * | | | | | | | | | | | | | revert grid and bars icon size changezotlabs2017-04-051-1/+1
| * | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-054-10/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-3113-59/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrfzotlabs2017-03-302-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-303-48/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-294-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | scaling issue with fa-th and fa-bars icons when using boostrap-red.css:37 #na...zotlabs2017-03-281-1/+1
| * | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-2811-41/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \