zotlabs
59645f51a9
Merge branch '2.2RC' of https://github.com/redmatrix/hubzilla into 2.2RC_merge
2017-02-23 11:31:52 -08:00
Mario Vavti
dd3e530a63
update changelog
2017-02-23 14:53:09 +01:00
Mario Vavti
3e2e60fb86
update changelog
2017-02-23 14:51:09 +01:00
Mario Vavti
9bab858fd1
move collapsed login and register buttons to the left
2017-02-23 12:32:27 +01:00
Mario Vavti
0ef8c5bda8
move collapsed login and register buttons to the left
2017-02-23 12:31:41 +01:00
Mario Vavti
d4be96cd03
yet one more place to use chanlink_hash() instead of chanlink_url()
2017-02-23 12:25:16 +01:00
Mario Vavti
3d0c6700db
yet one more place to use chanlink_hash() instead of chanlink_url()
2017-02-23 12:24:42 +01:00
Mario Vavti
5012baba15
one more place to use chanlink_hash() instead of chanlink_url()
2017-02-23 11:41:03 +01:00
Mario Vavti
41c67fa345
more places to use chanlink_hash() instead of chanlink_url() for profile_link
2017-02-23 10:36:00 +01:00
Mario Vavti
c75852455b
use chanlink_hash() instead of chanlink_url() for $profile_link
2017-02-23 09:53:24 +01:00
zotlabs
27fa15e95d
Merge pull request #685 from phellmes/dev
...
Update DE translation strings
2017-02-23 12:11:09 +11:00
phellmes
175e222927
Update DE translation strings
2017-02-22 14:50:28 +01:00
Mario Vavti
55924f5c5b
apps improvements
2017-02-22 11:22:43 +01:00
zotlabs
956f0043fc
change text back to 'add apps'
2017-02-21 23:16:05 -08:00
zotlabs
70cdbe4816
Merge pull request #684 from anaqreon/dev
...
Change Add Apps to Manage Apps and support translation.
2017-02-22 18:14:30 +11:00
zotlabs
6644dc4861
use head_add_link() for feed discovery
2017-02-21 18:58:51 -08:00
Andrew Manning
3e144baacd
Change Add Apps to Manage Apps and support translation.
2017-02-21 20:32:13 -05:00
zotlabs
bbacfbdd6a
display page not updating after comment
2017-02-21 15:24:39 -08:00
Mario Vavti
cbc0e5b934
do not lock out channels with only read perms from all post actions. we check read/write permissions for each command later in the process
2017-02-21 14:52:42 +01:00
Mario Vavti
81d556d32e
wrong permission
2017-02-21 10:34:40 +01:00
zotlabs
5ad5a0fa07
detect no acl
2017-02-20 23:13:27 -08:00
zotlabs
e54ba7ecbc
fix find_folder_hash_by_path() which was not safe against multiple attach structures with the same filename but in different directories
2017-02-20 23:03:48 -08:00
zotlabs
1c1d1f1185
update fr translation
2017-02-20 18:46:51 -08:00
zotlabs
bc1812840a
don't search on empty filename - we shouldn't find it. The reason why this change is being made is because we actually did find it due to a development glitch
2017-02-20 15:06:17 -08:00
zotlabs
74def75ca3
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-02-20 14:14:26 -08:00
Mario Vavti
924b353e5a
width must be 100% here
2017-02-20 23:09:21 +01:00
zotlabs
31618a4310
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-02-20 14:07:42 -08:00
zotlabs
21e3481810
wiki page permissions issue
2017-02-20 14:07:22 -08:00
Mario Vavti
d7ba2c7168
if we slide to left aside make the overlay darker and leave aside as is
2017-02-20 14:02:39 +01:00
zotlabs
6f811fd7f9
bug in adding main.js as a js source
2017-02-19 17:04:37 -08:00
zotlabs
573846707c
fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work:
...
- if there is no preceding / character, we look for the file within all the appropriate theme directories.
- otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir
- files beginning with // are considered to be schemeless URLs.
Therefore 'foo.css' means find the best theme-able representation of foo.css.
'/library/foo.css' means only use the version of foo.css that is in /library.
2017-02-19 16:50:41 -08:00
zotlabs
02e487f306
this icon also appears to require the fixed-width attribute
2017-02-19 14:14:58 -08:00
zotlabs
73b28b5d94
change primary directory per request
2017-02-18 12:40:43 -08:00
zotlabs
2a7ec29cd1
string update
2017-02-17 12:32:02 -08:00
Mario Vavti
d4f8a8dedd
add the generic-icons-nav class
2017-02-17 18:32:18 +01:00
Mario Vavti
f23c380cae
add register button for collapsed state
2017-02-17 16:31:36 +01:00
Mario Vavti
7151467db7
fixed width icons for item dropdown
2017-02-17 16:08:18 +01:00
Mario Vavti
16a8416495
css fixes and rename link to full docs to help since its app is also called help
2017-02-17 15:07:20 +01:00
zotlabs
5db3b71c6a
strip possible quotes from attribute_contains() haystacks
2017-02-15 11:35:36 -08:00
zotlabs
8897c5763a
typo
2017-02-15 10:55:53 -08:00
zotlabs
07d92796d2
provide HTTP header parser which honours continuation lines and despite the fact that continuation lines have been deprecated - as they still exist in the wild.
2017-02-14 20:57:14 -08:00
zotlabs
1f39c16d99
util/pconfig - don't enumerate empty arrays, mod_acl - add more comments
2017-02-13 17:51:39 -08:00
zotlabs
c8aeb5b160
Merge pull request #676 from anaqreon/doco
...
Doco
2017-02-14 12:51:01 +11:00
Andrew Manning
69b08a2062
Merge remote-tracking branch 'upstream/dev' into doco
2017-02-13 20:38:11 -05:00
Andrew Manning
05fd5eb8be
Integrated more content and deleted the original locations where applicable.
2017-02-13 20:37:58 -05:00
zotlabs
8ed0913df6
Merge pull request #675 from mjfriaza/dev
...
Updated the Spanish translation
2017-02-14 06:44:16 +11:00
Manuel Jiménez Friaza
d85bcb2e37
Fix 'settings/channel' page in Spanish contextual help
2017-02-13 15:48:06 +01:00
Manuel Jiménez Friaza
09e5732f8a
Updated the Spanish contextual help
2017-02-13 15:24:54 +01:00
Manuel Jiménez Friaza
d7fcf31be5
Updated the Spanish translation
2017-02-13 13:56:17 +01:00
zotlabs
f63aaa5429
be consistent with the name
2017-02-12 18:42:43 -08:00
