Commit Graph

18942 Commits

Author SHA1 Message Date
zotlabs
5cbf603203 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-26 14:40:20 -07:00
Mario Vavti
c327b00efa fix app-icon color and use bs class for w100 2017-03-26 13:45:27 +02:00
Mario Vavti
7634d4ce69 fix nav menu caret 2017-03-26 13:27:46 +02:00
Mario Vavti
98c6548d64 fix and cleanup custom theme settings 2017-03-26 13:15:15 +02:00
Mario Vavti
d169ee658e minor css cleanup 2017-03-26 11:16:16 +02:00
zotlabs
dc59817a9d use the long form legal text. 2017-03-25 14:50:47 -07:00
zotlabs
66fcea0ad8 update license 2017-03-25 14:49:18 -07:00
zotlabs
a572609dbd widget file update 2017-03-25 14:42:40 -07:00
zotlabs
94e458018b rm widgets again 2017-03-25 14:41:43 -07:00
zotlabs
e5e0a6b31f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-25 14:40:31 -07:00
zotlabs
5c63f7dd58 provide platform specific install script 2017-03-25 14:19:32 -07:00
zotlabs
b0b5db770d provide compatibility with old-style update system 2017-03-25 13:22:14 -07:00
zotlabs
878614f97a get rid of 'davguest' and allow for project specific DB updates (currently db updates are common between all possible projects/subprojects/forks). 2017-03-25 13:07:46 -07:00
Mario Vavti
2115eb26a7 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-03-25 09:41:51 +01:00
Mario Vavti
4f4c9bf5d6 fix full template nav 2017-03-25 09:41:35 +01:00
Mario Vavti
90ab050493 fix active state 2017-03-24 19:41:58 +01:00
Mario Vavti
28e0911f29 remove obsolete todo 2017-03-24 17:07:22 +01:00
Mario Vavti
fd23844c8d remove redundant css 2017-03-24 16:50:59 +01:00
Mario Vavti
5dc457b16c fix some active and hover colors 2017-03-24 16:10:37 +01:00
Mario Vavti
aadfb97d5a missing badge-default class 2017-03-24 15:50:54 +01:00
Mario Vavti
83abceb8be must be 1.35rem 2017-03-24 10:29:44 +01:00
Mario Vavti
727a2fe4ea restrict height of images in #banner to 1.5 rem 2017-03-24 10:23:23 +01:00
Mario Vavti
cb6c21ce90 do not return false here. it can lead to unresponsive links under certain situations. 2017-03-24 10:09:02 +01:00
zotlabs
a2e1019978 move db_upgrade to zlib 2017-03-23 21:49:20 -07:00
Mario Vavti
1171e1dd9c fix viewconnections 2017-03-23 14:15:08 +01:00
Mario Vavti
fff7be2c0f fix spinner position 2017-03-23 13:33:33 +01:00
Mario Vavti
a1ef698cf2 update fullcalendar library to version 3.2.0 2017-03-23 13:24:39 +01:00
Mario Vavti
43a794a905 bs4 fixes for events 2017-03-23 13:11:27 +01:00
Mario Vavti
4d50fe0928 bump versions 2017-03-23 09:35:59 +01:00
zotlabs
e98938d03d rev update 2017-03-23 00:20:12 -07:00
zotlabs
c3c1572683 allow setting the system email name/address/reply 2017-03-22 21:40:43 -07:00
zotlabs
708f738952 add mascot 2017-03-22 20:39:07 -07:00
zotlabs
5f1da17406 red koala 2017-03-22 20:35:20 -07:00
zotlabs
0499deea69 more cloud updates - upgrade the DAV structures as well. 2017-03-22 19:31:43 -07:00
zotlabs
0fb0241901 some more photo issues 2017-03-22 16:11:38 -07:00
zotlabs
24b55bbc9b fix photo prvnxt after all the changes yesterday 2017-03-22 12:41:16 -07:00
Mario Vavti
3a7db8ec60 fix embed image modals 2017-03-22 13:15:53 +01:00
Mario Vavti
bc3e1e99fe Merge branch 'dev' into bs4 2017-03-22 12:12:44 +01:00
Mario Vavti
efdd95fe7f css fixes 2017-03-22 11:52:22 +01:00
zotlabs
65ecc5ae15 more work on the photo album mess 2017-03-21 22:05:36 -07:00
zotlabs
83a78a949d photos_album_exists() requires an observer to work correctly; provide it. 2017-03-21 21:13:14 -07:00
zotlabs
a7bf4366ce use the same host macro for sender address as for reply_to address 2017-03-21 21:00:48 -07:00
zotlabs
066ab8c1fc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-21 20:59:26 -07:00
zotlabs
bedc393425 begin the process of using the relevant attach directory/path for photo albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact 2017-03-21 20:11:48 -07:00
zotlabs
c1cc7bfc94 update license 2017-03-21 17:14:58 -07:00
Klaus
caae956f6e Merge pull request #705 from dawnbreak/dev
 Some more tests for purify_html().
2017-03-22 00:59:09 +01:00
Klaus Weidenbach
30a3339653 Some more tests for purify_html().
Add some generic HTML, JS, CSS expectations for purify_html().
Also cover our own configuration for HTMLPurifier.
2017-03-22 00:50:49 +01:00
Mario Vavti
a7d184ba54 add generic-icons-nav class 2017-03-21 13:59:44 +01:00
Mario Vavti
546867c102 add icon, name and thumb to profile tabs. remove login app - we have login in the panel now. 2017-03-21 13:38:44 +01:00
Mario Vavti
42fbc28b11 missing template 2017-03-21 12:00:19 +01:00