harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 5a7e8d8520 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-19 11:35:31 +02:00
  • 63146821d7 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-18 23:02:49 -07:00
  • 9ed8eac8c6 include site identitfier on redmatrix delivery reports also redmatrix 2015-09-18 23:02:03 -07:00
  • 40bb1699a5 DB table for delivery reports redmatrix 2015-09-18 22:55:47 -07:00
  • 74827133b2 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-18 22:46:21 -07:00
  • 7c8706757d Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-18 22:44:23 -07:00
  • 3dc066a143 dummy update redmatrix 2015-09-18 22:43:35 -07:00
  • 43251ed8ce add reporting site to delivery report redmatrix 2015-09-18 22:00:33 -07:00
  • 1a16822987 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-18 14:32:23 -07:00
  • fdd4c1b9d1 more work on surviving hub re-installs redmatrix 2015-09-18 14:31:29 -07:00
  • 1bd1050160 Added hot_deploy directly to .openshift/makers/hot_deploy Haakon Meland Eriksen 2015-09-18 18:58:43 +02:00
  • 525a0478b0 Added hot_deploy to deploy script - fixed echo Haakon Meland Eriksen 2015-09-18 18:55:56 +02:00
  • ce28760c2a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-18 18:51:39 +02:00
  • 438cb1d7e0 Added hot_deploy to deploy script Haakon Meland Eriksen 2015-09-18 18:51:03 +02:00
  • 87c8cf4892 css fixes Mario Vavti 2015-09-18 13:07:04 +02:00
  • f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. redmatrix 2015-09-18 01:53:04 -07:00
  • 4d05d477f8 Merge remote-tracking branch 'upstream/master' zottel 2015-09-18 09:38:55 +02:00
  • cc95c3e9c8 start hooking in the new webfinger/zot merged discovery redmatrix 2015-09-17 18:36:19 -07:00
  • f0a7a6a1e2 consolidate zotfinger and webfinger redmatrix 2015-09-17 17:51:31 -07:00
  • 4090843fef Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them. jeroenpraat 2015-09-17 22:39:48 +02:00
  • c6c18261a0 missing refernce to array Mario Vavti 2015-09-17 19:33:44 +02:00
  • d9e83eb53a Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-09-17 19:25:36 +02:00
  • 1cf404177d quickfix for private messages - needs a lot more work Mario Vavti 2015-09-17 19:25:13 +02:00
  • ed9ffec5ba Merge pull request #46 from anaqreon/master git-marijus 2015-09-17 17:38:20 +02:00
  • 582607c0f0 Another (hopefully final) Spanish update jeroenpraat 2015-09-17 16:28:31 +02:00
  • 6cd5826d21 Revert "moved submit button to the bottom in settings.tpl" Mario Vavti 2015-09-17 15:05:40 +02:00
  • b7e953f50e fix calculation of content height with margins Mario Vavti 2015-09-17 14:14:01 +02:00
  • 9f630b6653 Corrected some missing space typos in docs Andrew Manning 2015-09-17 06:44:12 -04:00
  • 024af91df8 Merge pull request #1 from redmatrix/master mrjive 2015-09-17 09:27:13 +02:00
  • 3017dbc8c1 Merge remote-tracking branch 'upstream/master' zottel 2015-09-17 08:50:28 +02:00
  • 5d33b34be7 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-16 21:57:57 -07:00
  • f2104b0a5a Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-16 21:57:21 -07:00
  • 84b004399e push revision redmatrix 2015-09-16 21:56:55 -07:00
  • e8a01f0916 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-16 21:56:34 -07:00
  • 4f1d579ba1 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-16 21:56:26 -07:00
  • c34d8286a3 change matrix to grid, begin webfinger optimisation redmatrix 2015-09-16 21:27:58 -07:00
  • 4eb389f2d9 Merge pull request #45 from anaqreon/master redmatrix 2015-09-17 11:49:55 +10:00
  • 999ac60a87 Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzilla and grid Andrew Manning 2015-09-16 21:44:24 -04:00
  • 30af694e30 Merge pull request #44 from mrjive/move_submit_button redmatrix 2015-09-17 10:19:43 +10:00
  • fa76da1dab Merge pull request #43 from mrjive/toggleselect redmatrix 2015-09-17 10:19:27 +10:00
  • 1500691cc2 moved submit button to the bottom in settings.tpl mrjive 2015-09-16 04:46:47 -07:00
  • fae5ea749a added toggle_select mrjive 2015-09-16 02:25:44 -07:00
  • c2dac55edb Merge remote-tracking branch 'upstream/master' zottel 2015-09-16 09:56:11 +02:00
  • 4c5a74284b serve as application/xrd+xml redmatrix 2015-09-15 21:47:01 -07:00
  • d0a3cfe765 italian string correction redmatrix 2015-09-15 19:59:06 -07:00
  • 580f1f1213 Less margin jeroenpraat 2015-09-15 22:00:12 +02:00
  • b87d164f2f Cleaned some wrong metadata from PNG files. jeroenpraat 2015-09-15 21:50:49 +02:00
  • f3c8f342ff Made the favicons a bit sharper (direct from SVG) and cleaned some wrong metadata from PNG files. jeroenpraat 2015-09-15 21:49:26 +02:00
  • 63a1d8d0db make sure we've got a doc type redmatrix 2015-09-15 01:39:38 -07:00
  • 93f5cc1e60 I'm not going to tell you what's wrong because I'll be accused of bashing another project. I'll let you read the logs and figure it out for yourself. Follow the trail of evidence and you'll discover the truth. redmatrix 2015-09-15 01:24:55 -07:00
  • 68a503049b persona redmatrix 2015-09-14 22:24:58 -07:00
  • fae43010c5 nit redmatrix 2015-09-14 21:35:41 -07:00
  • 30351f5ade Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-14 21:35:30 -07:00
  • 325a5b4af4 we need an owner for permissions_sql redmatrix 2015-09-14 21:25:10 -07:00
  • 021c81cb62 don't deliver to dead hubs redmatrix 2015-09-14 20:43:39 -07:00
  • 7099e09a5c Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-14 19:17:36 -07:00
  • 97b990c9bf site checking stuff redmatrix 2015-09-14 19:16:25 -07:00
  • db3d99f7c7 Merge pull request #41 from redmatrix/display_load_average redmatrix 2015-09-15 10:53:05 +10:00
  • 8fb4f37670 remove xchan_instance_url - it needs to be an abook field, not an xchan field redmatrix 2015-09-14 16:05:58 -07:00
  • dfd4115f7a Update siteinfo.tpl jeroenpraat 2015-09-14 16:45:15 +02:00
  • e58ad35fb0 Update siteinfo.php jeroenpraat 2015-09-14 16:42:32 +02:00
  • 31db5078c1 Small update Spanish strings jeroenpraat 2015-09-14 16:36:06 +02:00
  • 40c78d23e6 quick fix for choklet bannertwo Mario Vavti 2015-09-14 09:27:15 +02:00
  • ec1d6d537e quick fix for choklet bannertwo Mario Vavti 2015-09-14 09:20:08 +02:00
  • 06bfd2b502 Merge remote-tracking branch 'upstream/master' zottel 2015-09-14 08:55:46 +02:00
  • fd708b28b8 ping site function (taken from admin/hubloc) redmatrix 2015-09-13 22:48:18 -07:00
  • 03e3281beb mod_locs - put the primary into a (non-functioning) button for visual consistency. redmatrix 2015-09-13 20:15:33 -07:00
  • f247b9ce20 update redmatrix 2015-09-13 20:03:16 -07:00
  • 67909b55fc Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-13 19:05:15 -07:00
  • 43ba690eda profile photo change activities redmatrix 2015-09-13 19:04:46 -07:00
  • 3425267368 fix banner for full flavour Mario Vavti 2015-09-13 16:16:03 +02:00
  • 0c3d9af333 hopefully fix banner for choklet flavour Mario Vavti 2015-09-13 14:56:44 +02:00
  • 67c2b309d1 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-12 14:38:26 -07:00
  • df0fa9883c check for empty word after trim redmatrix 2015-09-12 14:37:55 -07:00
  • 9821a39549 an attempt to fix the banner mess Mario Vavti 2015-09-12 11:36:19 +02:00
  • 692e117c8a Merge pull request #38 from MicMee/master redmatrix 2015-09-12 08:25:27 +10:00
  • d96ca61f2b Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-11 14:57:26 -07:00
  • fc58b8cc0d log the remote message if there was one redmatrix 2015-09-11 14:56:31 -07:00
  • c8503daf5a Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-11 14:33:36 -07:00
  • 45e1f93e56 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-11 14:33:07 -07:00
  • 77807d439e minor change on invite redmatrix 2015-09-11 14:32:18 -07:00
  • e062c4e6b5 another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive redmatrix 2015-09-11 14:30:07 -07:00
  • 755edd2110 ensure that living sites are marked as alive Michael Meer 2015-09-11 14:06:37 +02:00
  • f51124397f center page content by default - css file Mario Vavti 2015-09-11 11:56:56 +02:00
  • e42111545b center page content by default Mario Vavti 2015-09-11 11:54:35 +02:00
  • 5112b4b963 css fix Mario Vavti 2015-09-11 09:26:24 +02:00
  • 99c5c7ab28 Merge remote-tracking branch 'upstream/master' zottel 2015-09-11 08:15:19 +02:00
  • edb1473f13 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-11 06:42:11 +02:00
  • f2171173fe separate the links redmatrix 2015-09-10 19:35:26 -07:00
  • 7f30863df2 forum mode - use linked avatar and name for title instead of "Channel: xxxxx" or "Forum: xxxx" redmatrix 2015-09-10 19:31:42 -07:00
  • a6a2c02b6a duplicated code redmatrix 2015-09-10 19:21:32 -07:00
  • d3ee99d677 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-10 19:20:21 -07:00
  • 4abfd4053a sync likes redmatrix 2015-09-10 19:18:12 -07:00
  • 05e0ed5173 export likes to clones redmatrix 2015-09-10 19:17:20 -07:00
  • 00b480527a provide remote delivery report at logger_debug level redmatrix 2015-09-10 17:53:06 -07:00
  • e4231efd20 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-10 16:51:53 -07:00
  • 922d2165b3 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-10 16:51:22 -07:00
  • 9cee52c668 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-10 16:49:09 -07:00
  • 50e32c3d8a zot_refresh: always try the hubloc pointed to by xchan_addr first redmatrix 2015-09-10 16:48:08 -07:00
  • 5e576bff63 fix radius setting Mario Vavti 2015-09-10 22:22:51 +02:00