798b80e486
do not remove cover photo after scrolling it up. mimik an scroll edge if scrolling up again before scrolling into the cover photo again.
2016-08-24 22:40:15 +02:00
aa0384bcec
Revert "revert cover photo changes"
...
This reverts commit 4c840d70a4
2016-08-24 22:39:30 +02:00
dd654b9766
provide a mechanism for global template values (macro replacements that are available to all templates). There's a strong likelihood this list will increase but we may wish to actively prevent it from mushrooming out of control.
2016-08-24 13:11:01 -07:00
4c840d70a4
revert cover photo changes
2016-08-24 12:56:45 -07:00
238621ee92
allow changing the server role - as well as configuring any of the three options during installation
2016-08-23 23:00:24 -07:00
206054678b
cover photo: adjustments to display the entire photo on manual scrollback (padding added for nav height)
2016-08-23 20:10:56 -07:00
a5035dee74
several cover photo widget enhancements:
...
- allow a click anywhere on the page to cause the photo to autoscroll
- provide a logic flag to autoscroll only once
- allow manual scroll back to see the cover photo afterward (tricky to handle the nav menu here)
- on scroll back, the nav remains fixed at the top and the top pixels of the cover photo are covered (this was an acceptable tradeoff to gain the ability to see the photo again without causing unpredictable behaviour of the nav)
- some positioning details in small screen width mode caused jot to be off screen due to insufficient top padding; a manual padding was also added as something still wasn't right even after adding the nav height
- very minor nit: if screen size is reduced below 755 and then upsized again, the cover photo will not be redisplayed
2016-08-23 19:13:46 -07:00
d3369384d1
include port in pdo url when host is 'localhost'
2016-08-23 18:18:05 -07:00
420aa4bc44
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-23 06:57:10 -04:00
305e0538d2
Website export to cloud files works. Created new recursive copy function in attach.php.
2016-08-23 06:55:26 -04:00
8aee932525
version
2016-08-23 00:46:22 -07:00
8b737e9610
Merge branch 'master' into 1.12RC
2016-08-22 23:02:38 -07:00
0b16a5531a
Revert "Merge branch '1.12RC'"
...
This reverts commit b89c869e7cfbb357ac47
2016-08-22 20:31:31 -07:00
b7fbd0ee50
Revert "missing release file"
...
This reverts commit 17fa2d8801
2016-08-22 20:30:39 -07:00
2afdb7854b
Revert "more missing files from merge"
...
This reverts commit 1bd784cf12
2016-08-22 20:30:17 -07:00
1bd784cf12
more missing files from merge
2016-08-22 20:19:31 -07:00
17fa2d8801
missing release file
2016-08-22 20:17:37 -07:00
b89c869e7c
Merge branch '1.12RC'
2016-08-22 20:05:25 -07:00
1e6a491400
change default server role
2016-08-22 19:45:21 -07:00
38ca3bac40
optional server role compatibility checks for plugins
2016-08-22 17:41:41 -07:00
1a506ad49c
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge
2016-08-22 17:06:56 -07:00
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
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
d6d21cb5f6
doco updates
2016-08-22 16:46:44 -07:00
d177cf94da
server role management, part 1
2016-08-22 16:21:07 -07:00
f4507d878d
Spanish and Dutch strings
2016-08-22 19:45:46 +02:00
a3e0e67953
remove references to tinymce which were causing console errors
2016-08-21 19:40:11 -07:00
7045b920ef
make zid() do the right things when confronted with url fragments
2016-08-21 17:38:36 -07:00
9a057623d6
Merge branch 'git-marijus-dev' into dev
2016-08-21 16:34:42 -07:00
b6a545b4a2
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
2016-08-21 16:33:59 -07:00
d4ef3c183c
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge
2016-08-21 16:29:41 -07:00
5c3b06b8a9
issue #496
2016-08-21 16:29:16 -07:00
4d34d9c032
issue #496
2016-08-21 16:26:30 -07:00
4f62d7a78f
move jotnets to jot and some cleanup (mostly whitespace)
2016-08-21 15:43:03 +02:00
d39cf23b2f
Visual improvements to the export element table
2016-08-21 06:53:19 -04:00
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
2d42d58738
Layouts list and are selectable for export to the zip file
2016-08-20 16:05:27 -04:00
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
4cf172d46f
Merge branch 'zp' into dev
2016-08-19 17:39:08 -07:00
d1fa63b389
string update
2016-08-19 17:13:34 -07:00
9fe4bae52f
block backdoor delivery of bulk imported items
2016-08-19 17:12:48 -07:00
cf93d9c3b4
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-19 19:34:04 -04:00
40a7d38210
Pages populate the available-to-export list. New checkbox class for smaller boxes.
2016-08-19 19:32:52 -04:00
e4244c0cac
remove insecure repository warning.
2016-08-18 17:22:54 -07:00
3c88f3e6ee
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-17 19:45:00 -07:00
fa98f4c55d
import anomaly
2016-08-17 19:44:24 -07:00
f2e87a204d
Progress implementing zip file export
2016-08-17 21:25:50 -04:00
c98b91f514
Stash changes for merge with dev
2016-08-17 18:19:36 -04:00
15d9bf4ebe
Updating Spanish and Dutch strings
2016-08-17 17:37:21 +02:00
6dd4e9ac60
Merge pull request #493 from phellmes/de20160817
...
Update DE translation strings
2016-08-17 20:44:05 +10:00
Mario Vavti
redmatrix
redmatrix
Andrew Manning
jeroenpraat