harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,125 Commits 6 Branches 36 Tags
8ce4814835e10dc579036be9ff4e61077df875ae
Commit Graph

1203 Commits

Author SHA1 Message Date
redmatrix b737e224b1 more work separating Diaspora from core 2015-08-03 16:52:51 -07:00
redmatrix c1a953f960 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-31 15:45:13 -07:00
redmatrix 5e985ef34f consistency of event form 2015-07-31 15:42:52 -07:00
redmatrix cbb6d37b6c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-27 20:59:37 -07:00
redmatrix 52ccbd6b64 align buttons on event calendar 2015-07-27 20:58:25 -07:00
redmatrix 3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-27 18:01:20 -07:00
redmatrix 85f546e691 crude but more or less functional event import from thunderbird ics files 2015-07-26 22:44:49 -07:00
redmatrix 3880b485cb Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
	view/pt-br/messages.po
	view/pt-br/strings.php
 2015-07-26 16:50:33 -07:00
Mario Vavti f6142d18c4 Provide connection status if status is "a-normal" 2015-07-26 20:54:09 +02:00
redmatrix c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/to_do_code.bb
 2015-07-21 17:13:48 -07:00
Mario Vavti 4d45bc9da1 Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. 2015-07-20 21:01:11 +02:00
Mario Vavti 464625cd91 show icons instead of disabled checkboxes 2015-07-20 15:03:55 +02:00
redmatrix 15b6e8faa4 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
 2015-07-19 21:08:34 -07:00
Mario Vavti 39a09eb525 fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos 2015-07-16 22:04:52 +02:00
redmatrix 6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
Mario Vavti 0c77a127f2 show inherited state in Connection Default Permissions 2015-07-15 14:03:34 +02:00
redmatrix e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
Mario Vavti 104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti 4fe64179c8 disable the inherited checkboxes for notself 2015-07-14 19:29:49 +02:00
Mario Vavti cc1764989f fix mod_connedit.js after cleanup 2015-07-14 17:37:33 +02:00
Mario Vavti f267bd55d6 revert this until further investigation 2015-07-14 14:20:23 +02:00
Mario Vavti 7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix 6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
Mario Vavti f81874ca49 fix sys channel menu in a morre standard way 2015-07-12 01:04:57 +02:00
Mario Vavti d8f03450e7 make menu creation for sys channel work 2015-07-12 00:40:12 +02:00
redmatrix a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
 2015-07-10 14:27:41 -07:00
Mario Vavti fee607db56 more webpages - generic-content-wrapper fixes 2015-07-10 13:16:45 +02:00
Mario Vavti 1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly 2015-07-10 12:46:20 +02:00
Mario Vavti 115c18353e move profile image up and refine the aside width 2015-07-09 14:44:24 +02:00
Mario Vavti efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix 6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
Mario Vavti f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
Mario Vavti adfb4072e8 various css fixes 2015-07-07 12:13:15 +02:00
Mario Vavti 807471d2a5 move if clause outside of the div 2015-07-07 09:56:30 +02:00
Mario Vavti ee01e67fa7 use default style for default webpage 2015-07-07 09:41:27 +02:00
redmatrix 97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix 0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix 6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
Mario Vavti 7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix 63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
 2015-06-28 22:33:13 -07:00
redmatrix de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
Mario Vavti e9cc06dc11 directory: only provide connect button if we are not already connected 2015-06-24 21:12:20 +02:00
redmatrix 833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
Mario Vavti b6c4601d8f some work on directory 2015-06-23 13:06:22 +02:00
Mario Vavti a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02:00
redmatrix ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	util/messages.po
 2015-06-21 20:51:07 -07:00
redmatrix 68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
Mario Vavti c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. 2015-06-21 17:53:44 +02:00