Commit Graph
24059 Commits
Author SHA1 Message Date
zotlabs 1077686bda send directory realm_token for navbar autocomplete searches - if configured 2017-05-10 17:02:56 -07:00
Mario Vavti 582d075c45 missing clearfix 2017-05-10 17:39:49 +02:00
Mario Vavti b60f1085db missing clearfix 2017-05-10 17:39:15 +02:00
phellmesandMario Vavti a3bdfc1580 Update DE translation strings 2017-05-10 14:54:01 +02:00
git-marijusandGitHub 76a8711570 Merge pull request #766 from phellmes/dev
Update DE translation strings (also for 2.4RC)
2017-05-10 14:52:41 +02:00
zotlabsandMario Vavti 87b424123b don't allow html in plugin comment blocks 2017-05-10 14:50:22 +02:00
zotlabsandMario Vavti 9a66d47d54 use correct data type 2017-05-10 14:50:16 +02:00
zotlabsandMario Vavti 5a0712f766 zot protocol doco updates 2017-05-10 14:50:11 +02:00
zotlabsandMario Vavti 660ea89521 handle mastodon urls in markdown/bbcode conversion 2017-05-10 14:50:06 +02:00
zotlabsandMario Vavti 60204becf4 don't allow html in plugin comment blocks 2017-05-10 14:49:32 +02:00
zotlabsandMario Vavti 032216153f use correct data type 2017-05-10 14:49:07 +02:00
zotlabsandMario Vavti dac4447e33 zot protocol doco updates 2017-05-10 14:48:49 +02:00
zotlabsandMario Vavti fa94c0a65b handle mastodon urls in markdown/bbcode conversion 2017-05-10 14:48:04 +02:00
zotlabs 76d78571d6 don't allow html in plugin comment blocks 2017-05-09 20:33:25 -07:00
zotlabs 556407408f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-09 19:12:23 -07:00
zotlabs a862bf488c use correct data type 2017-05-09 19:03:16 -07:00
zotlabs f629dc51aa zot protocol doco updates 2017-05-09 19:02:02 -07:00
phellmes 96cc6a916d Update DE translation strings 2017-05-09 16:00:02 +02:00
Mario Vavti 6c0e0b3eae make all label bold 2017-05-09 10:25:12 +02:00
Mario Vavti 8a129610da make all label bold 2017-05-09 10:23:51 +02:00
Manuel Jiménez FriazaandMario Vavti 8688753522 Updated the Spanish translation 2017-05-09 10:23:12 +02:00
git-marijusandGitHub 9a0400c93a Merge pull request #763 from anaqreon/dev
Implemented switch statement logic in Comanche layout parser.
2017-05-09 10:16:11 +02:00
git-marijusandGitHub 13b5eb0ad8 Merge pull request #762 from mjfriaza/dev
Updated the Spanish translation
2017-05-09 10:07:51 +02:00
zotlabs e059efb4c4 handle mastodon urls in markdown/bbcode conversion 2017-05-08 19:10:08 -07:00
root 0be74c6551 Implemented switch statement logic in Comanche layout parser. 2017-05-08 20:55:31 -04:00
Manuel Jiménez Friaza 6fe6e1596f Updated the Spanish translation 2017-05-08 13:12:26 +02:00
zotlabsandMario Vavti 0e7c3951a6 get rid of edit activities 2017-05-08 11:12:27 +02:00
zotlabsandMario Vavti 40c8549cf5 get rid of edit activities 2017-05-08 11:12:09 +02:00
zotlabsandMario Vavti a7ea370ec3 cover photo was unintentionally disabled when block_public in effect 2017-05-08 11:11:50 +02:00
zotlabsandMario Vavti b6c6f06537 cover photo was unintentionally disabled when block_public in effect 2017-05-08 11:11:35 +02:00
zotlabs 2e531c103f error 2017-05-08 02:00:00 -07:00
zotlabs 1a05939e0b cleanup of last checkin 2017-05-07 18:05:29 -07:00
zotlabs acb8e85b61 cover photo was unintentionally disabled when block_public in effect 2017-05-07 17:25:38 -07:00
zotlabs 8c38841a4d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-07 14:43:38 -07:00
zotlabs 2c2ee706ac get rid of edit activities 2017-05-07 14:40:11 -07:00
Klaus WeidenbachandMario Vavti b7df4de4b7 :construction_worker::white_check_mark:🐛 Import table structure in TravisCI.
Fix a syntax error in schema_postres.sql which was discovered while
working on this.
2017-05-07 15:09:53 +02:00
git-marijusandGitHub b237425c94 Merge pull request #760 from anaqreon/2.4RC
Mail message mimetype was getting set as the subject due to wrong var…
2017-05-07 15:07:26 +02:00
git-marijusandGitHub bd3708870d Merge pull request #756 from dawnbreak/QA_testing
:construction_worker::white_check_mark:🐛 Import table structure in TravisCI.
2017-05-07 15:06:45 +02:00
git-marijusandGitHub 2aa699d03e Merge pull request #761 from anaqreon/dev
Mail subject bug fix
2017-05-07 15:05:50 +02:00
Andrew Manning 1d20b2603a Mail subject bug fix 2017-05-07 08:52:26 -04:00
Andrew Manning 6576f9c0c3 Mail message mimetype was getting set as the subject due to wrong variable set order. 2017-05-07 07:29:45 -04:00
zotlabs f840082aae Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-05 16:58:46 -07:00
Klaus Weidenbach f162508ad1 :construction_worker::white_check_mark:🐛 Import table structure in TravisCI.
Fix a syntax error in schema_postres.sql which was discovered while
working on this.
2017-05-06 01:07:15 +02:00
Mario Vavti 3ccefa20e8 collapse sysapps if viewing a remote channel 2017-05-05 16:33:28 +02:00
Mario Vavti 00b19ccee0 collapse sysapps if viewing a remote channel 2017-05-05 16:32:20 +02:00
Mario Vavti 54d55fb62f css hack to make remote channel menu header look in line with the rest if in collapsed state 2017-05-05 14:41:55 +02:00
Mario Vavti dcc8a94d07 css hack to make remote channel menu header look in line with the rest if in collapsed state 2017-05-05 14:40:35 +02:00
Mario Vavti 5dd501e0ea css fix 2017-05-05 12:58:27 +02:00
Mario Vavti af7a3fc2ea css fix 2017-05-05 12:57:41 +02:00
zotlabsandMario Vavti 4b4b06bec5 markdown autolinks - hubzilla bug #752 2017-05-05 12:46:12 +02:00