aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
|\
| * last merge from master did reset the std_version to 1.8 - set it back to 1.9 ...Mario Vavti2016-06-201-1/+1
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-2040-86788/+61549
|\|
| * Merge branch 'master' into devMario Vavti2016-06-2040-86788/+61549
| |\
| | * missing backslash leading to wsod on xconfig changesMario Vavti2016-06-201-2/+2
| | * merge conflictredmatrix2016-06-191-6/+0
| | * zot_revision should be string, not float1.8redmatrix2016-06-191-1/+1
| | * recreate link from the merge kerfuffleredmatrix2016-06-191-0/+1
| | * Merge branch '1.8RC'redmatrix2016-06-192861-171567/+92849
| | |\
| | | * hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| | | * hebrew updateredmatrix2016-06-183-3548/+1311
| | | * changelog update for 1.8redmatrix2016-06-171-0/+4
| | | * "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| | | * Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_mergeredmatrix2016-06-1544-81254/+77509
| | | |\
| | | | * All languages up to date as far as they are updated. Added Hebrew (I saw no R...jeroenpraat2016-06-1544-81254/+77509
| | | * | translate already imported system appsredmatrix2016-06-151-0/+2
| | | |/
| | | * Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_mergeredmatrix2016-06-152-5529/+5467
| | | |\
| | | | * Merge pull request #420 from phellmes/de20160615Jeroen van Riet Paap2016-06-152-5529/+5467
| | | | |\
| | | | | * Update DE translation stringsphellmes2016-06-152-5529/+5467
| | | | |/
| | | * / add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
| | | |/
| | | * DB schema issue with importredmatrix2016-06-121-12/+26
| | | * Merge pull request #414 from anaqreon/1.8RChubzilla2016-06-132-16/+4
| | | |\
| | | | * Apply purify_html to page content before preview and save to prevent JavaScri...Andrew Manning2016-06-122-16/+4
| | | |/
| | * | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| | * | Merge pull request #426 from eduoda/masterhubzilla2016-06-191-1/+1
| | |\ \
| | | * | When picktime is false, close date selector on date selectOda2016-06-181-1/+1
| | |/ /
| | * | Merge pull request #424 from BlaBlaNet/masterhubzilla2016-06-199-0/+19195
| | |\ \
| | | * | hebrew translationroot2016-06-189-0/+19195
| | |/ /
| | * | class object callredmatrix2016-06-041-1/+1
| | * | class functions not called with an objectredmatrix2016-06-041-3/+3
| | * | make init static on master alsoredmatrix2016-06-031-2/+2
| | * | minor version rollredmatrix2016-05-161-1/+1
| | * | issue #386 (master)redmatrix2016-05-161-1/+1
| | * | be specificredmatrix2016-05-151-1/+1
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-05-1515-1/+1
| | |\ \
| | | * | stupid gitjeroenpraat2016-05-1514-0/+113
| | | * | the other way aroundjeroenpraat2016-05-1514-113/+0
| | * | | roll minor version due to changeredmatrix2016-05-151-1/+1
| | * | | issue #387redmatrix2016-05-151-1/+2
| | |/ /
| | * | Merge pull request #382 from mjfriaza/devredmatrix2016-05-1514-273/+58
| | |\ \
| | | * | Another updated context help es-esManuel Jiménez Friaza2016-05-1414-273/+58
| | * | | issue #383redmatrix2016-05-142-2/+1
| | * | | SECURITY: edited comment to private post loses privacy info. Not visible in s...redmatrix2016-05-122-1/+11
| | * | | update std_versionredmatrix2016-05-121-1/+1
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-2021-42/+108
|\| | | |
| * | | | Added many of the recent schema changes to the database schema documentationredmatrix2016-06-1915-27/+72
| * | | | update the bbcode docredmatrix2016-06-191-1/+2
| * | | | experimental rtl support; this will probably require a fair bit of work.redmatrix2016-06-193-3/+18
| * | | | Don't use count() to check DB resultsredmatrix2016-06-192-11/+16
* | | | | return something so we can make a conclusionMario Vavti2016-06-191-0/+5