aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-wiki-escaping' into 'dev'M. Dent2018-10-101-1/+1
|\ | | | | | | | | Fix escaping quote for wiki_delete_page See merge request hubzilla/core!1324
| * Fix escaping quote for wiki_delete_pageM.Dent2018-10-091-1/+1
| |
* | Merge branch 'fix-wiki-escaping' into 'dev'Mario2018-10-086-41/+92
|\| | | | | | | | | Fix wiki escaping (Regression tests needed) See merge request hubzilla/core!1321
| * Rework Wiki encoding scheme.M.Dent2018-10-086-24/+32
| |
| * Implement custom escapingM.Dent2018-10-084-21/+64
| |
* | Merge branch 'dev' into 'dev'Mario2018-10-082-3472/+4305
|\ \ | |/ |/| | | | | Update Spanish translation See merge request hubzilla/core!1322
| * Update Spanish translationManuel Jiménez Friaza2018-10-082-3472/+4305
|/
* typoMario Vavti2018-10-081-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-083-13596/+13744
|\
| * Merge branch 'patch-8' into 'dev'Mario2018-10-082-13595/+13741
| |\ | | | | | | | | | | | | New russian translation See merge request hubzilla/core!1319
| | * Update hstrings.phpMax Kostikov2018-10-081-2676/+2682
| | |
| | * New russian translationMax Kostikov2018-10-081-10919/+11059
| | |
| * | Merge branch 'patch-2' into 'dev'Mario2018-10-081-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 clonedMax Kostikov2018-10-051-1/+3
| | | |
* | | | the root cause for doubled entries is fixed nowMario Vavti2018-10-081-1/+1
|/ / /
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-081-3/+2
|\ \ \
| * | | hubzilla core issue #1278 - page update always reloads if noscript content ↵zotlabs2018-10-071-3/+2
| | | | | | | | | | | | | | | | is enabled
* | | | Merge branch 'fix-runaway-cron' into 'dev'M. Dent2018-10-081-2/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix too many arguments in ClearQueue() queries See merge request hubzilla/core!1320
| * | | Fix too many argumentsM.Dent2018-10-071-2/+0
|/ / /
* | | Merge branch 'fix-runaway-cron' into 'dev'M. Dent2018-10-071-4/+118
|\ \ \ | | | | | | | | | | | | | | | | Fix (potential) runaway cron See merge request hubzilla/core!1318
| * | | Fix (potential) runaway cronM. Dent2018-10-071-4/+118
|/ / /
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-072-6/+6
|\| |
| * | use hubloc_store_lowlevel to ensure all hubloc columns are initialisedzotlabs2018-10-061-1/+1
| | |
| * | minor app cleanupzotlabs2018-10-051-5/+5
| | |
| * | Merge branch 'dev'zotlabs2018-10-04144-869/+1321
| |\ \
* | \ \ Merge branch 'dev' into 'dev'M. Dent2018-10-071-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing else clause See merge request hubzilla/core!1317
| * | | | Add missing else clauseM.Dent2018-10-061-2/+3
| | | | |
* | | | | return success for postgresMario Vavti2018-10-061-8/+11
| | | | |
* | | | | fix issue #1281 - hubloc default valuesMario Vavti2018-10-063-2/+27
| | | | |
* | | | | those 3px make a difference on medium sized screensMario Vavti2018-10-061-1/+1
| | | | |
* | | | | give apps some more space and prevent linebreaks in app names. Add ellipsis ↵Mario Vavti2018-10-061-2/+5
| | | | | | | | | | | | | | | | | | | | to too long names.
* | | | | another db update to get rid of the old view bookmarks entriesMario Vavti2018-10-062-1/+24
| | | | |
* | | | | move profile assign selector to profile settings and personal menu selector ↵Mario Vavti2018-10-066-74/+61
|/ / / / | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section.
* | | | this did not actually make senseMario Vavti2018-10-061-5/+0
| | | |
* | | | strings and force import_system_apps() on std_version changeMario Vavti2018-10-062-267/+316
| | | |
* | | | rename widget titlesMario Vavti2018-10-062-2/+2
| | | |
* | | | rename grid to network (for consistency) and activity to stream (as seen in ↵Mario Vavti2018-10-067-8/+36
| | | | | | | | | | | | | | | | osada) because it makes much more sense.
* | | | pubstream appMario Vavti2018-10-064-7/+41
| | | |
* | | | randprof appMario Vavti2018-10-061-1/+21
| | | |
* | | | remote diagnostics appMario Vavti2018-10-062-5/+18
| | | |
* | | | admin should not be an app imho - we can not install/delete admin abilities. ↵Mario Vavti2018-10-062-9/+0
| | | | | | | | | | | | | | | | Remove suggest channels from base apps.
* | | | merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-065-6/+6
|\ \ \ \
| * \ \ \ Merge branch 'patch-6' into 'dev'Mario2018-10-064-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add new table names in docs See merge request hubzilla/core!1315
| | * | | | Update database.bbMax Kostikov2018-10-061-2/+2
| | | | | |
| | * | | | Update intro_for_developers.bbMax Kostikov2018-10-061-2/+2
| | | | | |
| | * | | | Update db_groups.bbMax Kostikov2018-10-061-0/+0
| | | | | |
| | * | | | Add new table names in docsMax Kostikov2018-10-061-0/+0
| | | | | |
| * | | | | Merge branch 'patch-5' into 'dev'Mario2018-10-061-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Respect new table names on import See merge request hubzilla/core!1314
| | * | | | Respect new table names on importMax Kostikov2018-10-061-2/+2
| |/ / / /
* | | | | gallery is not a core appMario Vavti2018-10-061-1/+0
| | | | |