harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,415 Commits 6 Branches 36 Tags
e67f5bc6bbb77d53867d7c03bda8410c59360dbe
Commit Graph
17415 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti e67f5bc6bb Revert "remove some logging" 
This reverts commit 316b090433.
 2016-08-05 15:19:17 +02:00
Mario Vavti 316b090433 remove some logging 2016-08-05 14:53:46 +02:00
Mario Vavti b2298d44a4 multi acl: port /settings 2016-08-05 14:45:06 +02:00
Mario Vavti c029839971 multi acl: port /display 2016-08-05 14:25:37 +02:00
Mario Vavti e7e73e6fd1 multi acl: port /thing 2016-08-05 13:37:47 +02:00
Mario Vavti bed0a5773f multi acl: port /rpost 2016-08-05 13:20:03 +02:00
Mario Vavti 53a2262fef Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-08-05 12:13:50 +02:00
hubzillaandGitHub 709206accd Merge pull request #476 from anaqreon/wiki 
Wiki bbcode parsing
 2016-08-05 18:03:31 +10:00
Andrew Manning faf1045ef5 Merge remote-tracking branch 'upstream/dev' into wiki 2016-08-04 19:48:59 -04:00
Andrew Manning 6a82ff871f Parse bbcode when page loads 2016-08-04 19:45:35 -04:00
Mario Vavti 7e5428c697 multi acl: provide a acl-form-trigger class which comes handy in certain situations 2016-08-04 21:26:30 +02:00
Mario Vavti 036b72757c multi acl: port /wiki 2016-08-04 12:09:06 +02:00
Mario Vavti 120e9a1e4c multi acl: port /webpages and /mitem 2016-08-04 11:23:43 +02:00
Mario Vavti b49cfb2efd multi acl: port /chat 2016-08-04 10:46:50 +02:00
Mario Vavti 0340160ba7 multi acl: port /cloud and /filestorage 2016-08-04 10:36:45 +02:00
Mario Vavti 4ede3fd771 multi acl: port photos 2016-08-04 09:10:21 +02:00
Mario Vavti 3783c1af3e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-08-04 08:10:13 +02:00
redmatrix 92862f93f3 issue #474 2016-08-03 21:42:41 -07:00
Andrew Manning 05a9f0aa14 Convert select bbcode tags including [observer], [baseurl], [sitename] 2016-08-03 20:53:51 -04:00
redmatrix 64810405ef Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-03 16:12:17 -07:00
redmatrix 178c983871 issue #473 - unable to delete privacy groups 2016-08-03 16:10:28 -07:00
Mario Vavti 908e15bc90 multi acl: port events 2016-08-03 23:57:41 +02:00
Mario Vavti df27a48e72 multiple acl: store new data in update_view() 2016-08-03 22:50:37 +02:00
Mario Vavti b959641ca8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-08-03 21:17:08 +02:00
Mario Vavti c50bfa07ca multiple acl work 2016-08-03 21:16:57 +02:00
jeroenpraat 416adeb169 belongs to previous commit 2016-08-03 16:41:36 +02:00
jeroenpraat 61f591cc88 Improved a few schemas - context help fix - dark schemas now have dark text areas (et al.) 2016-08-03 16:33:12 +02:00
redmatrix 0febfce268 missing comma in atoken update sql 2016-08-02 19:31:31 -07:00
redmatrix c4fd0af16d comment policy permissions typo 2016-08-02 18:21:43 -07:00
redmatrix 69354e808f this should sort out likes showing up as wall-to-wall posts on diaspora 2016-08-01 22:12:44 -07:00
redmatrix 3a7d3e3a54 This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections. 2016-08-01 20:12:52 -07:00
redmatrix 4c76b31684 /storeurl/cloudurl/ 2016-08-01 17:44:21 -07:00
redmatrix 3d0c90cbc5 allow individual permissions on atokens 2016-07-31 23:17:07 -07:00
redmatrix 9b9621e10d add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl) 2016-07-31 20:14:25 -07:00
redmatrix 86eb923f29 make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit. 2016-07-31 18:08:41 -07:00
hubzillaandGitHub 74c68f09e5 Merge pull request #469 from anaqreon/website-import 
Website import tool
 2016-08-01 09:13:43 +10:00
Andrew Manning 99afd0a449 Added help content for webpages app. Corrected apparent bug with capitalized Webpages.md 2016-07-31 10:20:03 -04:00
Andrew Manning 42b718b3e0 Merge remote-tracking branch 'upstream/dev' into website-import 2016-07-31 07:38:44 -04:00
Andrew Manning 1e3a645abe Remove scanned element column for existing element information which we are not yet populating. 2016-07-31 07:37:33 -04:00
Andrew Manning 7c47557554 Improved UI. Removed logger statements. 2016-07-31 07:30:25 -04:00
redmatrix da9b6690e5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-07-30 14:04:30 -07:00
Andrew Manning 32366284a8 Import element selection page added to allow selective importing. 2016-07-30 09:56:47 -04:00
Andrew Manning f17f51a9c1 Merge remote-tracking branch 'upstream/dev' into website-import 2016-07-30 06:30:46 -04:00
jeroenpraat d858bd9265 Updating es-es strings 2016-07-29 14:31:53 +02:00
Mario Vavti 5e5ec5a66a catch all input fields (in preparation for acl in this place) and display the files to upload in the right order 2016-07-29 11:30:33 +02:00
hubzillaandGitHub 3a320462fa Merge pull request #467 from anaqreon/multiple-attach 
Fixed bug where multiple post attachements by drag-and-drop were not …
 2016-07-29 09:55:13 +10:00
Andrew Manning 8925e0c6c9 Fixed bug where multiple post attachements by drag-and-drop were not being added to the post content. 2016-07-28 19:21:33 -04:00
Mario Vavti b15a53b672 missing space 2016-07-28 22:59:01 +02:00
Mario Vavti ed7e4df014 missing semicolon 2016-07-28 22:57:07 +02:00
Mario Vavti 3bf2935ee3 add more info on what is happening after we are at 100% and minor fixes 2016-07-28 22:32:58 +02:00