harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,059 Commits 6 Branches 36 Tags
beb4e00afb59fc7ec7c798e09152dfd8b026265f
Commit Graph
24059 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti 7877e2467e rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense. 
(cherry picked from commit 96277372d5)
 2018-10-06 16:41:19 +02:00
Mario Vavti 96277372d5 rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense. 2018-10-06 16:40:30 +02:00
Mario Vavti 98ee99071c pubstream app 
(cherry picked from commit b8991750c5)
 2018-10-06 16:09:05 +02:00
Mario Vavti b8991750c5 pubstream app 2018-10-06 16:08:15 +02:00
Mario Vavti 97acfd23fb randprof app 
(cherry picked from commit 18726737d0)
 2018-10-06 15:28:17 +02:00
Mario Vavti 18726737d0 randprof app 2018-10-06 15:27:46 +02:00
Mario Vavti af05fa3e85 remote diagnostics app 
(cherry picked from commit 6a297a8f3d)
 2018-10-06 15:22:27 +02:00
Mario Vavti 6a297a8f3d remote diagnostics app 2018-10-06 15:21:22 +02:00
Mario Vavti 309904b15a admin should not be an app imho - we can not install/delete admin abilities. Remove suggest channels from base apps. 
(cherry picked from commit 453ce4df3b)
 2018-10-06 15:12:56 +02:00
Mario Vavti 453ce4df3b admin should not be an app imho - we can not install/delete admin abilities. Remove suggest channels from base apps. 2018-10-06 15:12:13 +02:00
Mario Vavti 02537b80b2 gallery is not a core app 
(cherry picked from commit 9850d18420)
 2018-10-06 15:02:29 +02:00
Mario Vavti 62730366ee bookmarks: change wording 
(cherry picked from commit a522a66715)
 2018-10-06 15:02:07 +02:00
Mario Vavti 0558a25141 bookmark app 
(cherry picked from commit c2c891723f)
 2018-10-06 15:01:45 +02:00
Mario Vavti 3f57609b75 merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-10-06 15:00:40 +02:00
Mario Vavti 9850d18420 gallery is not a core app 2018-10-06 15:00:28 +02:00
Mario 05ae18d74e Merge branch 'patch-6' into 'dev' 
Add new table names in docs

See merge request hubzilla/core!1315

(cherry picked from commit 778086ce19)

4f70fd3e Add new table names in docs
2e4772ac Update db_groups.bb
4cb46c12 Update intro_for_developers.bb
c087aaf5 Update database.bb
 2018-10-06 14:54:38 +02:00
Mario 778086ce19 Merge branch 'patch-6' into 'dev' 
Add new table names in docs

See merge request hubzilla/core!1315
 2018-10-06 14:54:21 +02:00
Mario 63ba72331f Merge branch 'patch-5' into 'dev' 
Respect new table names on import

See merge request hubzilla/core!1314

(cherry picked from commit 3e231e7c13)

ebb4811a Respect new table names on import
 2018-10-06 14:53:37 +02:00
Mario 3e231e7c13 Merge branch 'patch-5' into 'dev' 
Respect new table names on import

See merge request hubzilla/core!1314
 2018-10-06 14:53:18 +02:00
Mario Vavti a522a66715 bookmarks: change wording 2018-10-06 14:50:17 +02:00
Mario Vavti c2c891723f bookmark app 2018-10-06 14:48:12 +02:00
Max Kostikov c087aaf5be Update database.bb 2018-10-06 14:48:04 +02:00
Max Kostikov 4cb46c124a Update intro_for_developers.bb 2018-10-06 14:43:40 +02:00
Max Kostikov 2e4772ac0e Update db_groups.bb 2018-10-06 14:40:48 +02:00
Max Kostikov 4f70fd3e71 Add new table names in docs 2018-10-06 14:39:54 +02:00
Max Kostikov ebb4811a75 Respect new table names on import 2018-10-06 14:06:24 +02:00
zotlabs 835e222af0 minor app cleanup 2018-10-05 16:27:50 -07:00
M. Dent a5e63aa90a Merge branch 'revert-f5acbccb' into 'dev' 
Revert Fix: for hook registration.  Needs more testing.

See merge request hubzilla/core!1311
 2018-10-05 19:32:42 +02:00
M. Dent 1922a2139d Revert "Merge branch 'dev' into 'dev'" 
This reverts merge request !1310
 2018-10-05 19:30:49 +02:00
M. Dent f5acbccb79 Merge branch 'dev' into 'dev' 
Fix: hooks not added to App::$hooks[] at the time of registration

See merge request hubzilla/core!1310
 2018-10-05 19:27:30 +02:00
M.Dent d39ebebc9d Fix: hooks not added to App::[] at the time of registration 2018-10-05 13:25:16 -04:00
Max KostikovandMario b5ed1de31e New russian translations hmessages.po 
(cherry picked from commit ff53da5b0a)
 2018-10-05 14:54:53 +02:00
Max KostikovandMario 5cf156f698 New russian translations hstrings.php 
(cherry picked from commit 9520123f6d)
 2018-10-05 14:54:22 +02:00
Mario dcd99c2d30 Merge branch 'undefined' into '3.8RC' 
New russian translations

See merge request hubzilla/core!1308
 2018-10-05 14:53:23 +02:00
Mario a29e5521cc Merge branch 'patch-3' into 'dev' 
Add 'Channel Export' in Apps list

See merge request hubzilla/core!1309
 2018-10-05 14:52:46 +02:00
Max Kostikov 59bd90b967 Add 'Channel Export' in Apps list 2018-10-05 13:31:54 +02:00
Max Kostikov ff53da5b0a New russian translations hmessages.po 2018-10-05 13:25:40 +02:00
Max Kostikov 9520123f6d New russian translations hstrings.php 2018-10-05 13:23:37 +02:00
Max Kostikov d9efb037e3 Prevent links damage on foreign channel repost for cloned 2018-10-05 13:16:29 +02:00
Mario Vavti c403c9aece Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RC 2018-10-05 12:10:15 +02:00
Mario Vavti df5115e7b8 force major version system apps import for 3.8RC - remove this at a later point 2018-10-05 12:09:54 +02:00
zotlabsandMario 22fbb512d5 do not propagate channel deletion for an already deleted channel. 
(cherry picked from commit 7c1e99884c)
 2018-10-05 11:45:09 +02:00
zotlabsandMario 2acfa7e525 regression: double linebreaks in viewsrc output 
(cherry picked from commit d33c331abd)
 2018-10-05 11:44:32 +02:00
Mario Vavti 69659e9bd5 Merge remote-tracking branch 'mike/master' into dev 2018-10-05 11:40:50 +02:00
Mario Vavti 6c066f6107 bump version 2018-10-05 11:33:52 +02:00
Mario Vavti b96a05494b optimize autoloader 2018-10-05 11:28:14 +02:00
Mario Vavti 0d42b4cf8a strings 2018-10-05 11:26:26 +02:00
Mario Vavti df0c77ccd3 bump version 2018-10-05 11:17:00 +02:00
zotlabs 3a0a611f15 Merge branch 'dev' 2018-10-04 19:20:10 -07:00
Mario Vavti 1eaf6df842 fix issues with bs accordions 2018-10-04 22:21:20 +02:00