harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,527 Commits 6 Branches 36 Tags 152 MiB
56f66ce001
Commit Graph

17527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hubzilla
14ca376902 Merge pull request #472 from einervonvielen/homeinstall-remove-owncloud 
Homeinstall remove owncloud
 2016-08-01 09:14:24 +10:00
hubzilla
77a9be845d Merge pull request #471 from einervonvielen/homeinstall-fix-letsencrypt-config-path 
Homeinstall fix letsencrypt config path
 2016-08-01 09:14:08 +10:00
hubzilla
9dd9e27fa8 Merge pull request #470 from einervonvielen/einervonvielen-fix-homeinstall-git-path 
homeinstall - fix - path to git clone
 2016-08-01 09:13:57 +10:00
hubzilla
74c68f09e5 Merge pull request #469 from anaqreon/website-import 
Website import tool
 2016-08-01 09:13:43 +10:00
Einer von Vielen
b60e36ea7a Changed homeinstall removed installation of owncloud from install 
script
 2016-07-31 18:53:28 +02:00
Einer von Vielen
fae7993f93 Fixed homeinstall script. 
parameter --config has to be used after a change of letsencrpyt.sh
 2016-07-31 18:38:45 +02:00
Einer von Vielen
215659a234 Merge remote-tracking branch 'mikemaster/master' 2016-07-31 18:05:16 +02: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
einervonvielen
c0e0379bab Merge pull request #2 from einervonvielen/einervonvielen-fix-homeinstall-git-path 
homeinstall - fix - path to git clone
 2016-07-31 15:27:45 +02:00
einervonvielen
c761531947 homeinstall - fix - path to git clone 2016-07-31 15:26:02 +02: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
jeroenpraat
287e9c8d68 Updating es-es strings 2016-07-29 14:24:20 +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
redmatrix
ae5c10a71c Merge branch '1.10RC' 2016-07-28 19:58:05 -07:00
redmatrix
4d5202353f Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge 2016-07-28 18:26:32 -07:00
redmatrix
142bcd6806 move fixes to po2php forward to 1.10 2016-07-28 18:26:06 -07:00
hubzilla
7075697f60 Merge pull request #465 from phellmes/de20160728 
Update DE translation strings
 2016-07-29 09:55:47 +10:00
hubzilla
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
redmatrix
856133b07d fix it strings after merge stuffup 2016-07-28 16:53:18 -07:00
redmatrix
0b2d809309 github didn't accept the last push. Touching the files to force a git revision 2016-07-28 16:47:08 -07:00
jeroenpraat
ec383aca03 Updated language files for release 2016-07-28 16:37:19 -07: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
redmatrix
bc74425872 Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge" 
This reverts commit 35f17acb38, reversing
changes made to 58cf5f310d.
 2016-07-28 16:02:51 -07: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
redmatrix
35f17acb38 Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge 2016-07-28 13:15:10 -07:00
redmatrix
58cf5f310d sql typo 2016-07-28 13:14:48 -07:00
redmatrix
2d916b531b Revert "issue #466, sql typo" 
This reverts commit 4ce8f965aa.
 2016-07-28 13:13:59 -07:00
redmatrix
12952c9821 issue #466, sql typo 2016-07-28 13:11:01 -07:00
redmatrix
4ce8f965aa issue #466, sql typo 2016-07-28 13:10:19 -07:00
jeroenpraat
47e1c4e059 Updated language files for release 2016-07-28 21:33:02 +02:00
jeroenpraat
47119ddc7d Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC 2016-07-28 21:07:46 +02:00
Mario Vavti
500ee4c1bf re-implement progress-bar to work with all browsers 2016-07-28 16:35:27 +02:00
Mario Vavti
fc105cf141 reusing the original form did not work so well via xhr upload - let us create a new form for this action. revert progressbar- only works nice in firefox 2016-07-28 15:35:45 +02:00
phellmes
18f0961caa Update DE translation strings 2016-07-28 14:09:29 +02:00
Mario Vavti
e65949f594 make progressbar slightly more transparent and give it a default width of 3px to indicate which files are to be uploaded 2016-07-28 11:54:42 +02:00
Mario Vavti
b05c1a9829 use single quote for js and double quote for html with proper escapes and implement a simple progressbar 2016-07-28 11:45:57 +02:00
Mario Vavti
9fa3956aa8 translate mime types to icons, update some icons, move file preview (upload progress) below table header 2016-07-28 10:28:48 +02:00
redmatrix
02fc082e45 github didn't accept the last push. Touching the files to force a git revision 2016-07-27 22:40:33 -07:00