redmatrix
|
47bd97b55d
|
doc search broken
|
2016-08-27 15:31:26 -07:00 |
|
redmatrix
|
de1e39add9
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-08-27 05:07:23 -07:00 |
|
redmatrix
|
ebd3b965fc
|
vsprintf error on sql query
|
2016-08-27 05:07:07 -07:00 |
|
git-marijus
|
1d455c21d4
|
Merge pull request #499 from mjfriaza/master
Add new page 'connedit' to Spanish context help & fixed a string in Spanish translation
|
2016-08-26 19:58:00 +02:00 |
|
Mario Vavti
|
8f631d0693
|
contact-block needs a class clear div at the end to not mess with following widgets and whitespace
|
2016-08-26 19:52:21 +02:00 |
|
Manuel Jiménez Friaza
|
0381102c27
|
Fixed a string in the Spanish translation
|
2016-08-25 12:20:53 +02:00 |
|
Manuel Jiménez Friaza
|
e81dccb14e
|
Fixed a string in the Spanish translation
|
2016-08-25 12:20:22 +02:00 |
|
Manuel Jiménez Friaza
|
5c3e6307b4
|
Add new page connedit to Spanish context help
|
2016-08-25 12:14:10 +02:00 |
|
redmatrix
|
8aee932525
|
version
|
2016-08-23 00:46:22 -07:00 |
|
redmatrix
|
8b737e9610
|
Merge branch 'master' into 1.12RC
|
2016-08-22 23:02:38 -07:00 |
|
redmatrix
|
0b16a5531a
|
Revert "Merge branch '1.12RC'"
This reverts commit b89c869e7c, reversing
changes made to fbb357ac47.
|
2016-08-22 20:31:31 -07:00 |
|
redmatrix
|
b7fbd0ee50
|
Revert "missing release file"
This reverts commit 17fa2d8801.
|
2016-08-22 20:30:39 -07:00 |
|
redmatrix
|
2afdb7854b
|
Revert "more missing files from merge"
This reverts commit 1bd784cf12.
|
2016-08-22 20:30:17 -07:00 |
|
redmatrix
|
1bd784cf12
|
more missing files from merge
|
2016-08-22 20:19:31 -07:00 |
|
redmatrix
|
17fa2d8801
|
missing release file
|
2016-08-22 20:17:37 -07:00 |
|
redmatrix
|
b89c869e7c
|
Merge branch '1.12RC'
|
2016-08-22 20:05:25 -07:00 |
|
redmatrix
|
1a506ad49c
|
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge
|
2016-08-22 17:06:56 -07:00 |
|
redmatrix
|
b0d3c17f19
|
public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms
|
2016-08-22 17:06:40 -07:00 |
|
jeroenpraat
|
f4507d878d
|
Spanish and Dutch strings
|
2016-08-22 19:45:46 +02:00 |
|
redmatrix
|
d4ef3c183c
|
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge
|
2016-08-21 16:29:41 -07:00 |
|
redmatrix
|
5c3b06b8a9
|
issue #496
|
2016-08-21 16:29:16 -07:00 |
|
jeroenpraat
|
15d9bf4ebe
|
Updating Spanish and Dutch strings
|
2016-08-17 17:37:21 +02:00 |
|
hubzilla
|
6dd4e9ac60
|
Merge pull request #493 from phellmes/de20160817
Update DE translation strings
|
2016-08-17 20:44:05 +10:00 |
|
phellmes
|
2b0c2891e3
|
Update DE translation strings
|
2016-08-17 10:39:21 +02:00 |
|
redmatrix
|
fbb357ac47
|
Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes.
|
2016-08-15 17:20:40 -07:00 |
|
redmatrix
|
38de583db0
|
Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes.
|
2016-08-15 17:20:29 -07:00 |
|
redmatrix
|
055ee75302
|
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge
|
2016-08-15 13:19:34 -07:00 |
|
Einer von Vielen
|
f95011a565
|
Merge dev with last changes of homeinstall script in master
|
2016-08-15 13:19:20 -07:00 |
|
Mario Vavti
|
6bb5ea7a81
|
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC
|
2016-08-15 11:22:20 +02:00 |
|
Mario Vavti
|
efcde8f3dd
|
update bootstrap 3.3.5 > 3.3.7
|
2016-08-15 11:21:57 +02:00 |
|
Mario Vavti
|
057266653b
|
fix javascript error if not logged in
|
2016-08-15 11:20:51 +02:00 |
|
Mario Vavti
|
2755c74c29
|
btn/dropdown rendering issue
|
2016-08-14 11:31:44 +02:00 |
|
hubzilla
|
5ad5afe63b
|
Merge pull request #481 from anaqreon/issue-475
Fixed bug preventing images in root photo album from loading in embed…
|
2016-08-14 09:54:12 +10:00 |
|
Mario Vavti
|
2c3843ee4c
|
remove js debugging
|
2016-08-13 22:28:40 +02:00 |
|
Mario Vavti
|
e5d1dd111e
|
fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript
|
2016-08-13 22:20:54 +02:00 |
|
Andrew Manning
|
125713e938
|
Fix for older photos not being embedded by the embedphotos tool.
|
2016-08-13 14:38:13 -04:00 |
|
Andrew Manning
|
e128ff4e8f
|
Fixed bug preventing images in root photo album from loading in embedphotos dialog.
|
2016-08-13 14:20:41 -04:00 |
|
redmatrix
|
2c8a82713e
|
pending flag not being reset when using autoperms from custom role
|
2016-08-12 18:18:35 -07:00 |
|
zottel
|
7d2a17ea6e
|
fix auto-connect setting
|
2016-08-12 14:44:48 -07:00 |
|
Mario Vavti
|
91b8c769bd
|
possible quickfix for multi-acl not honoring jotnets
|
2016-08-12 14:44:47 -07:00 |
|
redmatrix
|
0637a71669
|
embed filter adjustments
|
2016-08-11 17:34:05 -07:00 |
|
redmatrix
|
45dc995967
|
forum detection was off for forums with custom perms
|
2016-08-10 20:50:32 -07:00 |
|
redmatrix
|
d8240a40b7
|
update CHANGELOG for 1.12
|
2016-08-10 17:35:07 -07:00 |
|
redmatrix
|
adf34fb201
|
update version
|
2016-08-10 16:54:57 -07:00 |
|
Mario Vavti
|
82e867a9a8
|
implement acl for folder creation
|
2016-08-10 16:17:09 +02:00 |
|
redmatrix
|
7a557d31e0
|
open editor or comment window when linkdropping to a closed window. We probably also need this for filedropping.
|
2016-08-10 01:35:58 -07:00 |
|
redmatrix
|
de12503fad
|
allow dropping links on comments as well as posts
|
2016-08-09 22:52:14 -07:00 |
|
redmatrix
|
5238a27ab3
|
function order reversed
|
2016-08-09 20:50:33 -07:00 |
|
redmatrix
|
12162f53b4
|
You can drag links to the editor (which will be parsed and inserted); as well as files (which will be uploaded)
|
2016-08-09 18:13:54 -07:00 |
|
redmatrix
|
ec3ca11d0d
|
bad code format
|
2016-08-09 16:59:35 -07:00 |
|