harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,215 Commits 6 Branches 36 Tags
2b2723cb74dd74fc449d76f29edd7797b16c7e84
Commit Graph
15215 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Haakon Meland Eriksen 2b2723cb74 Merge remote-tracking branch 'upstream/master' 2015-11-24 07:23:43 +01:00
redmatrix e485ecb3b4 more database doco 2015-11-23 20:23:20 -08:00
redmatrix 8c5203f7e1 issue #185 - prevent liveUpdate from updating while the built-in html5 media player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time. 2015-11-23 17:47:18 -08:00
redmatrix dfaf1a1075 issue #183 2015-11-23 15:27:57 -08:00
redmatrix bf5c0e0b0d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-23 15:18:19 -08:00
redmatrix 167e754a1b issue #184 2015-11-23 15:17:38 -08:00
redmatrix 34b804e9dc Merge pull request #182 from anaqreon/url-selected 
Place link around selected text
 2015-11-24 09:41:55 +11:00
Haakon Meland Eriksen 7338649fa5 Merge remote-tracking branch 'upstream/master' 2015-11-23 14:16:14 +01:00
redmatrix ae1103c5a3 doco updates 2015-11-22 18:20:19 -08:00
redmatrix a7e4553ea7 delivery report tweaks 2015-11-22 17:12:30 -08:00
redmatrix 6f27e8db38 Merge https://github.com/redmatrix/hubzilla into pending_merge 
Conflicts:
	version.inc
 2015-11-22 14:08:20 -08:00
redmatrix 292b02b58c webpages and design elements weren't being included in the item export query. 2015-11-22 14:06:52 -08:00
Haakon Meland Eriksen e60f527cb0 Documenting the need to change database server address from 127.0.0.1 to localhost when installing Hubzilla on OpenShift with the deploy script 2015-11-22 10:50:17 +01:00
Haakon Meland Eriksen b5a5a91b13 Merge remote-tracking branch 'upstream/master' 2015-11-22 01:56:25 +01:00
Mario Vavti 4c84a2ce61 update datetimepicker and fix it for finish date 2015-11-22 00:13:33 +01:00
Mario Vavti 18e0e4b597 do not hide scrollbars 2015-11-21 23:51:50 +01:00
Mario Vavti 74b574d0b1 datetimepicker should also respect first day of week setting 2015-11-21 23:49:29 +01:00
Haakon Meland Eriksen 9ba1b8d720 Merge remote-tracking branch 'upstream/master' 2015-11-21 17:18:44 +01:00
Mario Vavti d726c921eb make calendar week start (sun or mon) configurable 2015-11-21 15:33:57 +01:00
Haakon Meland Eriksen bd45bb3ad3 Merge remote-tracking branch 'upstream/master' 2015-11-21 12:17:38 +01:00
Andrew Manning fee8503093 Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected 2015-11-20 21:57:10 -05:00
ken restivo fabf7081d3 Use http_status() instead of homegrowing it. Adapt http_status to handle replies with data. 2015-11-20 18:56:41 -08:00
Andrew Manning 6083cd2559 If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs. 2015-11-20 21:55:13 -05:00
ken restivo d11e80e1b3 Bump version, migrator needs to depend on it for f164ddf 2015-11-20 15:17:33 -08:00
Haakon Meland Eriksen 6942c715d0 Merge remote-tracking branch 'upstream/master' 2015-11-21 00:08:17 +01:00
redmatrix 427652e9bd Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-20 14:41:16 -08:00
redmatrix 106b4fdd2d add v4 project roadmap, partial fix for cloning of profile photos on alternate profiles 2015-11-20 14:38:32 -08:00
ken restivo f164ddf155 Report correct HTTP error code, i.e. for API callers. 2015-11-20 13:03:16 -08:00
redmatrix d9ddf7561f Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-20 12:51:24 -08:00
redmatrix 37368bda65 change _newwin to _blank because the window named _newwin may be hard to find if you have lots of windows/tabs open. 2015-11-20 12:49:38 -08:00
Haakon Meland Eriksen de1b3d5113 Space between Preview and Submit in jot.tpl 2015-11-20 21:15:12 +01:00
Haakon Meland Eriksen 830b01bd2a Space between Preview and Submit in jot.tpl 2015-11-20 21:12:09 +01:00
Haakon Meland Eriksen 90187eae37 Merge remote-tracking branch 'upstream/master' 2015-11-20 19:51:57 +01:00
Mario Vavti 7399f7a087 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-20 16:40:13 +01:00
Mario Vavti a3e47d26f6 make calendar language aware 2015-11-20 16:39:55 +01:00
jeroenpraat d3bef2adc3 update es+nl 2015-11-20 15:18:51 +01:00
redmatrix 7b459ec355 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-20 00:20:26 -08:00
redmatrix 301072a86c issue #85, community tags and file tags lost during edits. This required splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits. 2015-11-20 00:15:48 -08:00
Haakon Meland Eriksen 3b7b3ef2bb Rearranging buttons 2015-11-20 07:38:59 +01:00
Haakon Meland Eriksen b6e4611a91 Rearranging buttons 2015-11-20 07:35:43 +01:00
Haakon Meland Eriksen 2929bb672a Rearranging buttons 2015-11-20 07:29:45 +01:00
Haakon Meland Eriksen a4765bf954 Rearranging buttons 2015-11-20 07:03:36 +01:00
Haakon Meland Eriksen 0c2045beff Rearranging buttons 2015-11-20 06:52:35 +01:00
Haakon Meland Eriksen 22f6687f44 Merge remote-tracking branch 'upstream/master' 2015-11-20 06:27:46 +01:00
ken restivo e56633d5b0 Throw HTTP error and display error message when database is unavailable. #179 2015-11-19 20:58:13 -08:00
redmatrix a44795e6c3 change action label from 'stop following' to 'unfollow thread' 2015-11-19 17:27:07 -08:00
redmatrix 5805a54097 directory search for pubforums using hubzilla directory servers using redmatrix flag value 2015-11-19 16:44:12 -08:00
redmatrix 350519d429 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-19 16:15:16 -08:00
redmatrix 8f94c721bf new feature: 'suppress_duplicates' issue #146 triggered with less than two minutes between posts having identical content. 2015-11-19 16:05:47 -08:00
jeroenpraat c7652fc29c Had to switch these 2. Sorry. 2015-11-20 00:50:54 +01:00