aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-69/+94
|\
| * allow any (current) emoji to be displayed on any site, and provide a default ...redmatrix2016-06-031-14/+4
| * turn emoji ability into a feature so that either a member or the site admin c...redmatrix2016-06-031-1/+1
| * some theming for emoji buttonMario Vavti2016-06-032-95/+95
| * restrict emoji reactions to the top level for now.redmatrix2016-06-021-0/+2
| * menu entries for basic emoji support. I could use a bit of help theming this....redmatrix2016-06-022-0/+33
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-026-22/+31
|\|
| * more db column renamesredmatrix2016-05-313-10/+18
| * more removal of reserved words from DB schemasredmatrix2016-05-311-1/+1
| * render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-302-11/+14
* | Major corrections to access control and page construction.Andrew Manning2016-06-021-0/+2
* | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-302-1/+39
* | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-301-1/+1
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-0/+2
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-291-0/+2
* | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for p...Andrew Manning2016-05-292-0/+15
* | Home page create with new wiki. URL redirects here when no page given. Fixed ...Andrew Manning2016-05-291-1/+1
* | Wiki pages can be saved.Andrew Manning2016-05-281-2/+21
* | Show page content by default. Hide page controls where appropriate. Fix sandb...Andrew Manning2016-05-281-6/+8
* | Page content is loaded from the file on diskAndrew Manning2016-05-281-1/+1
* | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-282-5/+6
* | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-282-1/+18
* | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-271-0/+19
* | Wiki deletion worksAndrew Manning2016-05-271-0/+2
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-2723-2002/+2114
|\|
| * consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-2612-12/+12
| * some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-251-1/+1
| * app rendering issues, typo in class name and could not find icon 'fa-arrow-ci...redmatrix2016-05-251-1/+1
| * remove the add others button for now - after some research it turned out not ...Mario Vavti2016-05-252-8/+0
| * code cleanupredmatrix2016-05-241-1/+1
| * Update NL + ES_ESjeroenpraat2016-05-224-1318/+1398
| * Update DE translation stringsphellmes2016-05-212-661/+701
* | Delete wiki (in progress)Andrew Manning2016-05-242-3/+24
* | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-212-7/+4
* | Successful new wiki git repo and item table recordAndrew Manning2016-05-211-17/+4
* | Forgot some templatesAndrew Manning2016-05-212-0/+21
* | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-212-0/+118
|/
* possible fix for #385Mario Vavti2016-05-212-1/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-191-17/+32
|\
| * Replace text strings for translation supportAndrew Manning2016-05-191-9/+3
| * Improved plugin repo management UI in admin/pluginsAndrew Manning2016-05-191-17/+38
* | provide an acl select option for only meMario Vavti2016-05-192-15/+58
|/
* Merge pull request #388 from phellmes/de20160516hubzilla2016-05-172-3045/+3082
|\
| * Update DE translations stringsphellmes2016-05-162-3045/+3082
* | Dutch and Spanish Spanish strings, and some schema-bitsjeroenpraat2016-05-169-5809/+5990
|/
* Enable options for chat notifications, with optional audio. Notify for member...Andrew Manning2016-05-131-3/+45
* change wording restricted -> custom selection and add a label to the selectMario Vavti2016-05-131-1/+1
* instead of radio buttons use select to choose between public and restricted a...Mario Vavti2016-05-132-60/+70
* Merge remote-tracking branch 'upstream/dev' into chat-notifyAndrew Manning2016-05-112-23/+23
|\
| * Merge pull request #376 from anaqreon/plugin-reporedmatrix2016-05-121-3/+3
| |\