Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 40 | -86788/+61549 |
|\ | |||||
| * | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 40 | -86788/+61549 |
| |\ | |||||
| | * | missing backslash leading to wsod on xconfig changes | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| | * | merge conflict | redmatrix | 2016-06-19 | 1 | -6/+0 |
| | * | zot_revision should be string, not float1.8 | redmatrix | 2016-06-19 | 1 | -1/+1 |
| | * | recreate link from the merge kerfuffle | redmatrix | 2016-06-19 | 1 | -0/+1 |
| | * | Merge branch '1.8RC' | redmatrix | 2016-06-19 | 2861 | -171567/+92849 |
| | |\ | |||||
| | | * | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 |
| | | * | hebrew update | redmatrix | 2016-06-18 | 3 | -3548/+1311 |
| | | * | changelog update for 1.8 | redmatrix | 2016-06-17 | 1 | -0/+4 |
| | | * | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 |
| | | * | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge | redmatrix | 2016-06-15 | 44 | -81254/+77509 |
| | | |\ | |||||
| | | | * | All languages up to date as far as they are updated. Added Hebrew (I saw no R... | jeroenpraat | 2016-06-15 | 44 | -81254/+77509 |
| | | * | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 |
| | | |/ | |||||
| | | * | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge | redmatrix | 2016-06-15 | 2 | -5529/+5467 |
| | | |\ | |||||
| | | | * | Merge pull request #420 from phellmes/de20160615 | Jeroen van Riet Paap | 2016-06-15 | 2 | -5529/+5467 |
| | | | |\ | |||||
| | | | | * | Update DE translation strings | phellmes | 2016-06-15 | 2 | -5529/+5467 |
| | | | |/ | |||||
| | | * / | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
| | | |/ | |||||
| | | * | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 |
| | | * | Merge pull request #414 from anaqreon/1.8RC | hubzilla | 2016-06-13 | 2 | -16/+4 |
| | | |\ | |||||
| | | | * | Apply purify_html to page content before preview and save to prevent JavaScri... | Andrew Manning | 2016-06-12 | 2 | -16/+4 |
| | | |/ | |||||
| | * | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 |
| | * | | Merge pull request #426 from eduoda/master | hubzilla | 2016-06-19 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | When picktime is false, close date selector on date select | Oda | 2016-06-18 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #424 from BlaBlaNet/master | hubzilla | 2016-06-19 | 9 | -0/+19195 |
| | |\ \ | |||||
| | | * | | hebrew translation | root | 2016-06-18 | 9 | -0/+19195 |
| | |/ / | |||||
| | * | | class object call | redmatrix | 2016-06-04 | 1 | -1/+1 |
| | * | | class functions not called with an object | redmatrix | 2016-06-04 | 1 | -3/+3 |
| | * | | make init static on master also | redmatrix | 2016-06-03 | 1 | -2/+2 |
| | * | | minor version roll | redmatrix | 2016-05-16 | 1 | -1/+1 |
| | * | | issue #386 (master) | redmatrix | 2016-05-16 | 1 | -1/+1 |
| | * | | be specific | redmatrix | 2016-05-15 | 1 | -1/+1 |
| | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-05-15 | 15 | -1/+1 |
| | |\ \ | |||||
| | | * | | stupid git | jeroenpraat | 2016-05-15 | 14 | -0/+113 |
| | | * | | the other way around | jeroenpraat | 2016-05-15 | 14 | -113/+0 |
| | * | | | roll minor version due to change | redmatrix | 2016-05-15 | 1 | -1/+1 |
| | * | | | issue #387 | redmatrix | 2016-05-15 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | Merge pull request #382 from mjfriaza/dev | redmatrix | 2016-05-15 | 14 | -273/+58 |
| | |\ \ | |||||
| | | * | | Another updated context help es-es | Manuel Jiménez Friaza | 2016-05-14 | 14 | -273/+58 |
| | * | | | issue #383 | redmatrix | 2016-05-14 | 2 | -2/+1 |
| | * | | | SECURITY: edited comment to private post loses privacy info. Not visible in s... | redmatrix | 2016-05-12 | 2 | -1/+11 |
| | * | | | update std_version | redmatrix | 2016-05-12 | 1 | -1/+1 |
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 21 | -42/+108 |
|\| | | | | |||||
| * | | | | Added many of the recent schema changes to the database schema documentation | redmatrix | 2016-06-19 | 15 | -27/+72 |
| * | | | | update the bbcode doc | redmatrix | 2016-06-19 | 1 | -1/+2 |
| * | | | | experimental rtl support; this will probably require a fair bit of work. | redmatrix | 2016-06-19 | 3 | -3/+18 |
| * | | | | Don't use count() to check DB results | redmatrix | 2016-06-19 | 2 | -11/+16 |
* | | | | | return something so we can make a conclusion | Mario Vavti | 2016-06-19 | 1 | -0/+5 |
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-19 | 14 | -13/+21622 |
|\| | | | | |||||
| * | | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 |