Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-wiki-escaping' into 'dev' | M. Dent | 2018-10-10 | 1 | -1/+1 |
|\ | | | | | | | | | Fix escaping quote for wiki_delete_page See merge request hubzilla/core!1324 | ||||
| * | Fix escaping quote for wiki_delete_page | M.Dent | 2018-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fix-wiki-escaping' into 'dev' | Mario | 2018-10-08 | 6 | -41/+92 |
|\| | | | | | | | | | Fix wiki escaping (Regression tests needed) See merge request hubzilla/core!1321 | ||||
| * | Rework Wiki encoding scheme. | M.Dent | 2018-10-08 | 6 | -24/+32 |
| | | |||||
| * | Implement custom escaping | M.Dent | 2018-10-08 | 4 | -21/+64 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-10-08 | 2 | -3472/+4305 |
|\ \ | |/ |/| | | | | | Update Spanish translation See merge request hubzilla/core!1322 | ||||
| * | Update Spanish translation | Manuel Jiménez Friaza | 2018-10-08 | 2 | -3472/+4305 |
|/ | |||||
* | typo | Mario Vavti | 2018-10-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-08 | 3 | -13596/+13744 |
|\ | |||||
| * | Merge branch 'patch-8' into 'dev' | Mario | 2018-10-08 | 2 | -13595/+13741 |
| |\ | | | | | | | | | | | | | New russian translation See merge request hubzilla/core!1319 | ||||
| | * | Update hstrings.php | Max Kostikov | 2018-10-08 | 1 | -2676/+2682 |
| | | | |||||
| | * | New russian translation | Max Kostikov | 2018-10-08 | 1 | -10919/+11059 |
| | | | |||||
| * | | Merge branch 'patch-2' into 'dev' | Mario | 2018-10-08 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | Prevent links damage on foreign channel repost for cloned See merge request hubzilla/core!1307 | ||||
| | * | | Prevent links damage on foreign channel repost for cloned | Max Kostikov | 2018-10-05 | 1 | -1/+3 |
| | | | | |||||
* | | | | the root cause for doubled entries is fixed now | Mario Vavti | 2018-10-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-08 | 1 | -3/+2 |
|\ \ \ | |||||
| * | | | hubzilla core issue #1278 - page update always reloads if noscript content ↵ | zotlabs | 2018-10-07 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | is enabled | ||||
* | | | | Merge branch 'fix-runaway-cron' into 'dev' | M. Dent | 2018-10-08 | 1 | -2/+0 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Fix too many arguments in ClearQueue() queries See merge request hubzilla/core!1320 | ||||
| * | | | Fix too many arguments | M.Dent | 2018-10-07 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge branch 'fix-runaway-cron' into 'dev' | M. Dent | 2018-10-07 | 1 | -4/+118 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix (potential) runaway cron See merge request hubzilla/core!1318 | ||||
| * | | | Fix (potential) runaway cron | M. Dent | 2018-10-07 | 1 | -4/+118 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-07 | 2 | -6/+6 |
|\| | | |||||
| * | | use hubloc_store_lowlevel to ensure all hubloc columns are initialised | zotlabs | 2018-10-06 | 1 | -1/+1 |
| | | | |||||
| * | | minor app cleanup | zotlabs | 2018-10-05 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'dev' | zotlabs | 2018-10-04 | 144 | -869/+1321 |
| |\ \ | |||||
* | \ \ | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-07 | 1 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add missing else clause See merge request hubzilla/core!1317 | ||||
| * | | | | Add missing else clause | M.Dent | 2018-10-06 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | return success for postgres | Mario Vavti | 2018-10-06 | 1 | -8/+11 |
| | | | | | |||||
* | | | | | fix issue #1281 - hubloc default values | Mario Vavti | 2018-10-06 | 3 | -2/+27 |
| | | | | | |||||
* | | | | | those 3px make a difference on medium sized screens | Mario Vavti | 2018-10-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | give apps some more space and prevent linebreaks in app names. Add ellipsis ↵ | Mario Vavti | 2018-10-06 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | to too long names. | ||||
* | | | | | another db update to get rid of the old view bookmarks entries | Mario Vavti | 2018-10-06 | 2 | -1/+24 |
| | | | | | |||||
* | | | | | move profile assign selector to profile settings and personal menu selector ↵ | Mario Vavti | 2018-10-06 | 6 | -74/+61 |
|/ / / / | | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section. | ||||
* | | | | this did not actually make sense | Mario Vavti | 2018-10-06 | 1 | -5/+0 |
| | | | | |||||
* | | | | strings and force import_system_apps() on std_version change | Mario Vavti | 2018-10-06 | 2 | -267/+316 |
| | | | | |||||
* | | | | rename widget titles | Mario Vavti | 2018-10-06 | 2 | -2/+2 |
| | | | | |||||
* | | | | rename grid to network (for consistency) and activity to stream (as seen in ↵ | Mario Vavti | 2018-10-06 | 7 | -8/+36 |
| | | | | | | | | | | | | | | | | osada) because it makes much more sense. | ||||
* | | | | pubstream app | Mario Vavti | 2018-10-06 | 4 | -7/+41 |
| | | | | |||||
* | | | | randprof app | Mario Vavti | 2018-10-06 | 1 | -1/+21 |
| | | | | |||||
* | | | | remote diagnostics app | Mario Vavti | 2018-10-06 | 2 | -5/+18 |
| | | | | |||||
* | | | | admin should not be an app imho - we can not install/delete admin abilities. ↵ | Mario Vavti | 2018-10-06 | 2 | -9/+0 |
| | | | | | | | | | | | | | | | | Remove suggest channels from base apps. | ||||
* | | | | merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-06 | 5 | -6/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'patch-6' into 'dev' | Mario | 2018-10-06 | 4 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add new table names in docs See merge request hubzilla/core!1315 | ||||
| | * | | | | Update database.bb | Max Kostikov | 2018-10-06 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Update intro_for_developers.bb | Max Kostikov | 2018-10-06 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Update db_groups.bb | Max Kostikov | 2018-10-06 | 1 | -0/+0 |
| | | | | | | |||||
| | * | | | | Add new table names in docs | Max Kostikov | 2018-10-06 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'patch-5' into 'dev' | Mario | 2018-10-06 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Respect new table names on import See merge request hubzilla/core!1314 | ||||
| | * | | | | Respect new table names on import | Max Kostikov | 2018-10-06 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | gallery is not a core app | Mario Vavti | 2018-10-06 | 1 | -1/+0 |
| | | | | |