harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,609 Commits 6 Branches 36 Tags
86598705efd5e23ab9803736a24d70836d46bf42
Commit Graph
15609 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Haakon Meland Eriksen 86598705ef Add default_permissions_role social_private to autocreate a social private channel upon account registration 2016-01-18 19:47:06 +01:00
Haakon Meland Eriksen 5d24f62b95 Add Hubzilla Hubsites plugin to deploy script, change git for DeadSuperHero Hubzilla themes 2016-01-18 19:19:16 +01:00
Haakon Meland Eriksen dd3f69eaf3 Merge remote-tracking branch 'upstream/master' 2016-01-18 07:31:37 +01:00
redmatrix fc54f54b98 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-17 20:03:43 -08:00
redmatrix 80b88d819e doc updates 2016-01-17 20:03:33 -08:00
redmatrix 24c10ae733 Merge pull request #258 from einervonvielen/backup_to_usb_without_encryption 
backup to external device now possible without encryption
 2016-01-18 12:45:08 +11:00
redmatrix 3b18c82c88 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-17 16:51:06 -08:00
redmatrix be83855acf generalise the site icon 2016-01-17 16:50:37 -08:00
redmatrix 10ed334e8c various issues from the forums 2016-01-17 16:29:32 -08:00
Haakon Meland Eriksen c4a14c27cf Merge remote-tracking branch 'upstream/master' 2016-01-17 23:14:37 +01:00
jeroenpraat 819a331c4a update es-es and nl strings. adjusted a few matrix to grid strings 2016-01-17 20:03:26 +01:00
Einer von Vielen 9fa6593d7f backup to external device now possible without encryption. Before this 
the daily backup did allow LUKS+ext4 compatible file system only.
 2016-01-17 18:44:21 +01:00
Haakon Meland Eriksen 256472f9eb Merge remote-tracking branch 'upstream/master' 2016-01-17 11:26:18 +01:00
redmatrix 9b3b2efe9a call build_sync_packet() on pdledit updates 2016-01-17 01:05:32 -08:00
redmatrix da9a8d54de minversion issue 2016-01-17 00:17:23 -08:00
Haakon Meland Eriksen af8449cef8 Merge remote-tracking branch 'upstream/master' 2016-01-17 00:40:21 +01:00
redmatrix 0365f5d52c Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-16 14:04:14 -08:00
redmatrix 110ef6201e add $deliver flag to item_store() and item_store_update() [default true]. If false, do not send any notifications or process tag_deliver. This should avoid any network activity from happening as the result of a channel (actually item) import. Other minor fixes in the handling of the $allow_exec flag and further protecting CSS passed to widgets from rogue code and XSS. 2016-01-16 14:00:22 -08:00
Mario Vavti 0d5daea93d move dir total ratings button to the left to prevent the connect button beeing shifted on channels with ratings 2016-01-16 21:30:57 +01:00
Haakon Meland Eriksen 983e170f20 Merge remote-tracking branch 'upstream/master' 2016-01-16 13:44:23 +01:00
redmatrix f66c6bfebf Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-15 11:59:38 -08:00
redmatrix fe77ab4d71 minor version roll 2016-01-15 11:59:19 -08:00
Mario Vavti 2498df68c7 change button order for consistency 2016-01-15 13:20:45 +01:00
Mario Vavti d36aa4fc89 provide a recent activity link in /connections 2016-01-15 12:08:04 +01:00
Mario Vavti f4e1b2123a add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better... 2016-01-15 11:28:05 +01:00
Mario Vavti 63ee0daac5 provide more contact infos and update some protocol type definitions 2016-01-15 10:42:44 +01:00
ken restivo b58177e3c6 Use ctrl-d for multi-line messages. 2016-01-14 21:05:36 -08:00
redmatrix f888548e0e issue with plugin loadable layouts 2016-01-14 20:51:59 -08:00
redmatrix 6ff192c4ea update widget docs with widget_cover_photo 2016-01-14 18:43:54 -08:00
redmatrix 64753effd1 cover photo fetch and widget 2016-01-14 17:25:27 -08:00
redmatrix be9442e7b3 more cover photo work 2016-01-14 16:29:50 -08:00
Mario Vavti ef2890fe51 this might be controversal - if approving a connection from the popup go back to connections page. if the popup is dismissed and the connection is approved from the page stay on /connedit page to be able to adjust perms etc... 2016-01-15 00:03:15 +01:00
Mario Vavti 614dcb8bce since the perms will be reset on approval better do not provide the perms tool before we approved a connection 2016-01-14 23:38:00 +01:00
Mario Vavti 3ba81c8bb6 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-01-14 23:23:28 +01:00
Mario Vavti 588d022fbb provide some info about our contacts - status (archived, hidden, etc.), public forum (like in directory) and show since when we are connected 2016-01-14 23:23:12 +01:00
redmatrix 96990fc1c5 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-14 11:47:23 -08:00
redmatrix 4506d80198 revision update 2016-01-14 11:45:48 -08:00
Haakon Meland Eriksen 72353bf044 Merge remote-tracking branch 'upstream/master' 2016-01-14 18:14:30 +01:00
Mario Vavti 9f9fdc1434 bring back opacity for archived contacts 2016-01-14 14:00:02 +01:00
Mario Vavti e2b79c34bc some work on connections 2016-01-14 13:50:47 +01:00
Mario Vavti 69573c6afe some template work on follow widget 2016-01-14 10:36:45 +01:00
redmatrix e500a08f15 more progress on cover photo cropping and storage 2016-01-13 20:26:27 -08:00
redmatrix 82aec69302 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-13 17:32:42 -08:00
redmatrix 9584ca080c some initial work on uploading and cropping cover photos 2016-01-13 17:32:09 -08:00
Mario Vavti e1ddee6c26 fix sharing of photo items 2016-01-13 11:23:40 +01:00
redmatrix 86b550e43e Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-13 01:36:08 -08:00
redmatrix 3bf9dc9f18 more work on auto channel creation during register 2016-01-13 01:17:02 -08:00
Mario Vavti 0ca7aa8c09 20em is to big for mobile use 2016-01-13 09:39:46 +01:00
redmatrix 58efd7553c very small tweaks to CLI plugin manager utility 2016-01-13 00:08:07 -08:00
redmatrix 0484f5b0dc Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-12 20:05:37 -08:00