aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-285-2123/+2151
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Show page content by default. Hide page controls where appropriate. Fix sandb...Andrew Manning2016-05-282-8/+18
| | * | | | | | | | | | | | Page content is loaded from the file on diskAndrew Manning2016-05-283-4/+35
| | * | | | | | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-284-12/+25
| | * | | | | | | | | | | | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-285-15/+81
| | * | | | | | | | | | | | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-273-13/+120
| | * | | | | | | | | | | | Check if wiki exists and redirect if it does notAndrew Manning2016-05-272-1/+19
| | * | | | | | | | | | | | Wiki deletion worksAndrew Manning2016-05-272-6/+12
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-27152-5312/+4411
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Delete wiki (in progress)Andrew Manning2016-05-244-19/+89
| | * | | | | | | | | | | | | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-215-13/+39
| | * | | | | | | | | | | | | Successful new wiki git repo and item table recordAndrew Manning2016-05-215-82/+103
| | * | | | | | | | | | | | | Forgot some templatesAndrew Manning2016-05-212-0/+21
| | * | | | | | | | | | | | | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-21454-0/+3459
* | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1010-3504/+3553
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | strings updateredmatrix2016-06-101-3447/+3449
| * | | | | | | | | | | | | | foreach: invalid argumentredmatrix2016-06-092-14/+16
| * | | | | | | | | | | | | | change loglevelredmatrix2016-06-091-1/+1
| * | | | | | | | | | | | | | several "to-do" updatesredmatrix2016-06-093-22/+9
| * | | | | | | | | | | | | | add safemode toolredmatrix2016-06-091-0/+1
| * | | | | | | | | | | | | | Create the initial 1.8 changelog entry (subject to further changes)redmatrix2016-06-091-0/+69
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | remove the automatic ajax page load on pgdn key; it can load content much fas...redmatrix2016-06-091-16/+0
| * | | | | | | | | | | | | namespace issue with openid reverse authredmatrix2016-06-091-4/+4
| * | | | | | | | | | | | | allow an exclusion for transmitting hidden file activities. There may be a be...redmatrix2016-06-091-1/+5
* | | | | | | | | | | | | | more style workMario Vavti2016-06-092-2/+12
* | | | | | | | | | | | | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-092-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-0925-6391/+6420
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | issue #59redmatrix2016-06-081-0/+7
| | * | | | | | | | | | | | | potential fix to hubzilla-addons issue 16redmatrix2016-06-081-0/+5
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-061785-413/+391
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-03107-692/+755
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-0146-461/+295
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0811-397/+470
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | block random_profile from accessing sys channelsredmatrix2016-06-071-1/+2
| * | | | | | | | | | | | | | | | | whitespaceredmatrix2016-06-071-2/+5
| * | | | | | | | | | | | | | | | | Finish the config familyredmatrix2016-06-076-369/+442
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | slight alteration to the base descriptionredmatrix2016-06-071-2/+2
| * | | | | | | | | | | | | | | | 'recent photos' query was buggered, also fix issue #163 by adding configurabl...redmatrix2016-06-073-25/+21
* | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-076-49/+95
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | rename admin/users to admin/accounts, provide sortable columns in account and...redmatrix2016-06-064-48/+68
| * | | | | | | | | | | | | | | | new utility: util/safemode (on or off); requires util/addonsredmatrix2016-06-062-1/+27
* | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-069-5948/+5846
|\| | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | adjust the autocomplete regex slightly to account for emoji namesredmatrix2016-06-051-1/+1
| * | | | | | | | | | | | | | | move pconfig to static classredmatrix2016-06-052-174/+195
| * | | | | | | | | | | | | | | We need a laugh icon more than we need a cry icon.redmatrix2016-06-051-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-054-5772/+5642
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Updating NL + es_ES stringsjeroenpraat2016-06-064-5772/+5642
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * / | | | | | | | | | | | | I don't know how to make this any clearer: "For these reasons we strongly rec...redmatrix2016-06-051-0/+7
| |/ / / / / / / / / / / / /
* | | | | / / / / / / / / / Merge branch 'dev' into sabre32Mario Vavti2016-06-051785-413/+391
|\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |