redmatrix
|
38ca3bac40
|
optional server role compatibility checks for plugins
|
2016-08-22 17:41:41 -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 |
|
redmatrix
|
e967bc9c45
|
public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms
|
2016-08-22 17:04:13 -07:00 |
|
redmatrix
|
d6d21cb5f6
|
doco updates
|
2016-08-22 16:46:44 -07:00 |
|
redmatrix
|
d177cf94da
|
server role management, part 1
|
2016-08-22 16:21:07 -07:00 |
|
jeroenpraat
|
f4507d878d
|
Spanish and Dutch strings
|
2016-08-22 19:45:46 +02:00 |
|
redmatrix
|
a3e0e67953
|
remove references to tinymce which were causing console errors
|
2016-08-21 19:40:11 -07:00 |
|
redmatrix
|
7045b920ef
|
make zid() do the right things when confronted with url fragments
|
2016-08-21 17:38:36 -07:00 |
|
redmatrix
|
9a057623d6
|
Merge branch 'git-marijus-dev' into dev
|
2016-08-21 16:34:42 -07:00 |
|
redmatrix
|
b6a545b4a2
|
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
|
2016-08-21 16:33:59 -07: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 |
|
redmatrix
|
4d34d9c032
|
issue #496
|
2016-08-21 16:26:30 -07:00 |
|
Mario Vavti
|
4f62d7a78f
|
move jotnets to jot and some cleanup (mostly whitespace)
|
2016-08-21 15:43:03 +02:00 |
|
Andrew Manning
|
d39cf23b2f
|
Visual improvements to the export element table
|
2016-08-21 06:53:19 -04:00 |
|
Andrew Manning
|
1c61e316b4
|
Block export and re-import works. Fixed bug where layout content was not being imported properly.
|
2016-08-20 21:08:15 -04:00 |
|
Andrew Manning
|
2d42d58738
|
Layouts list and are selectable for export to the zip file
|
2016-08-20 16:05:27 -04:00 |
|
Andrew Manning
|
80ed05d45d
|
Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages.
|
2016-08-20 15:22:30 -04:00 |
|
redmatrix
|
4cf172d46f
|
Merge branch 'zp' into dev
|
2016-08-19 17:39:08 -07:00 |
|
redmatrix
|
d1fa63b389
|
string update
|
2016-08-19 17:13:34 -07:00 |
|
redmatrix
|
9fe4bae52f
|
block backdoor delivery of bulk imported items
|
2016-08-19 17:12:48 -07:00 |
|
Andrew Manning
|
cf93d9c3b4
|
Merge remote-tracking branch 'upstream/dev' into website-export
|
2016-08-19 19:34:04 -04:00 |
|
Andrew Manning
|
40a7d38210
|
Pages populate the available-to-export list. New checkbox class for smaller boxes.
|
2016-08-19 19:32:52 -04:00 |
|
redmatrix
|
e4244c0cac
|
remove insecure repository warning.
|
2016-08-18 17:22:54 -07:00 |
|
redmatrix
|
3c88f3e6ee
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-17 19:45:00 -07:00 |
|
redmatrix
|
fa98f4c55d
|
import anomaly
|
2016-08-17 19:44:24 -07:00 |
|
Andrew Manning
|
f2e87a204d
|
Progress implementing zip file export
|
2016-08-17 21:25:50 -04:00 |
|
Andrew Manning
|
c98b91f514
|
Stash changes for merge with dev
|
2016-08-17 18:19:36 -04: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 |
|
hubzilla
|
7939588702
|
Merge pull request #492 from wave72/dev
Updated Italian strings
|
2016-08-17 18:28:27 +10:00 |
|
Wave72
|
99c4d932bf
|
Updated Italian strings
|
2016-08-17 10:25:42 +02:00 |
|
redmatrix
|
537401cf27
|
don't set session theme unless logged in.
|
2016-08-16 22:15:51 -07:00 |
|
redmatrix
|
b2eede891a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-16 19:01:20 -07:00 |
|
redmatrix
|
a2873c18ca
|
get rid of ugly code construct
|
2016-08-16 19:00:38 -07:00 |
|
hubzilla
|
70d38fe5b3
|
Merge pull request #491 from mjfriaza/dev
Add Spanish context help settings/features page
|
2016-08-17 09:12:02 +10:00 |
|
Manuel Jiménez Friaza
|
f15456f4ab
|
Add Spanish context help settings/features page
|
2016-08-16 13:06:51 +02:00 |
|
Mario Vavti
|
9fc4246e1d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-16 08:05:53 +02:00 |
|
Mario Vavti
|
291b0edbe0
|
rename limited -> custom
|
2016-08-16 08:05:46 +02:00 |
|
Mario Vavti
|
452c4d13b0
|
remove unneeded function
|
2016-08-16 07:54:24 +02:00 |
|
redmatrix
|
70150718c5
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-15 22:46:06 -07:00 |
|
redmatrix
|
8a89cfb158
|
move schema settings into the display settings main so we can set theme:schema theme selectors in settings
|
2016-08-15 22:45:07 -07:00 |
|
Mario Vavti
|
86d2daf473
|
only check settings-form for dirty state and remove redundant javascript
|
2016-08-16 07:41:06 +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
|
7fc254a81c
|
Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes.
|
2016-08-15 17:18:42 -07:00 |
|
hubzilla
|
752bb169ed
|
Merge pull request #487 from git-marijus/dev
implement groups in the acl select.
|
2016-08-16 06:59:52 +10:00 |
|
Mario Vavti
|
4b101c2240
|
provide group options serverside and minor cleanup
|
2016-08-15 22:54:07 +02:00 |
|