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 |
|
redmatrix
|
be1ffca6f4
|
fix italian strings (messed up by rtl variable); and finish removing openid from core
|
2016-07-27 22:28:30 -07:00 |
|
hubzilla
|
987eb90e18
|
Merge pull request #464 from anaqreon/hover-visuals
Enhanced visual feedback for file drag hover
|
2016-07-28 12:07:01 +10:00 |
|
Andrew Manning
|
932aeebcf1
|
Enhanced visual feedback for file drag hover
|
2016-07-27 21:03:41 -04:00 |
|
redmatrix
|
5f3a8cbe93
|
add the hidden flag also
|
2016-07-27 16:14:46 -07:00 |
|
Mario Vavti
|
f808f1601b
|
rework drag and drop to drag directly into files area, implement the default upload button to work with the same mechanism as drag and drop, revert 560af7a5b8 since it did not work so well with the new cloud upload mechanism
|
2016-07-27 16:49:55 +02:00 |
|
redmatrix
|
672c3d7c6d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-26 22:51:07 -07:00 |
|
redmatrix
|
72479041ae
|
don't include deleted or orphaned xchans in ratings search
|
2016-07-26 22:50:31 -07:00 |
|
hubzilla
|
e286b510f1
|
Merge pull request #463 from git-marijus/dev
allow multiple-file cloud upload
|
2016-07-27 14:54:51 +10:00 |
|
redmatrix
|
315dafbe12
|
restrict url cache to 254 maxlen
|
2016-07-26 20:05:40 -07:00 |
|