harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,247 Commits 6 Branches 36 Tags
25caeee8547df73a7162dc6de30a030fa0bceea8
Commit Graph

65 Commits

Author SHA1 Message Date
Mario Vavti 987619130b some event heavy lifting - please test and report issues 2015-11-24 14:15:28 +01:00
redmatrix fff30b1c3d permission issues editing wall-to-wall posts 2015-11-15 19:36:17 -08:00
Mario Vavti c5aedb14a9 fix #83 2015-10-29 19:46:21 +01:00
Mario Vavti f7601756e9 create photo object if feature large photos is enabled and display those slightly different 2015-10-20 09:36:15 +02:00
redmatrix db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00
Mario Vavti b1f926ba89 merge redmatrix fixes 2015-07-10 20:46:46 +02: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
redmatrix cb76fb8b9b item flag fixes discovered after a few merges 2015-06-23 19:45:39 -07:00
redmatrix 3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
 2015-05-20 20:49:06 -07:00
redmatrix 6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances 2015-05-20 18:46:23 -07:00
friendica 6679734135 Merge branch 'master' into tres 
Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css
 2015-04-23 19:49:41 -07:00
friendica d3c064cc34 title of preview button incorrect, fix ability to upload to webpages 2015-03-30 19:41:42 -07:00
friendica b3a9a6c802 remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links. 2015-03-11 18:56:28 -07:00
friendica 79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica 912be23e16 Merge branch 'master' into tres 
Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php
 2015-01-29 15:09:35 -08:00
friendica a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica 6e0e3b2433 more expanding item flags 2015-01-22 18:41:10 -08:00
friendica 5b49211035 edit and preview removed from additional features and turned into core functionality (always enabled). 2014-12-16 14:28:07 -08:00
Stefan Parviainen 97d1072f9b Make it clear that title and categories are optional 2014-12-08 16:49:48 +01:00
friendica 5d5dde174e tinmymce zombie - kill it. 2014-07-17 01:25:21 -07:00
marijus b88a7fc23a use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it. 2014-04-09 18:29:22 +02:00
marijus 9f621dac85 change the way jot tools are displayed/hidden 2014-04-08 22:07:06 +02:00
friendica d9e4f63466 preserve attachments when editing a post 2014-02-14 13:15:02 -08:00
friendica f104b4dc27 preserve expiration when editing 2014-01-27 23:49:42 -08:00
Christian Vogeley aafc40069b Confirm webpage deletion prompt 2014-01-01 16:18:39 +01:00
Christian Vogeley 870df76463 Merge remote-tracking branch 'upstream/master' into bootstrap 
Conflicts:
	view/php/theme_init.php
 2013-12-22 14:31:27 +01:00
Christian Vogeley 25a533bd72 New modal dialog for item expiry 2013-12-22 14:21:57 +01:00
friendica 941f81eb30 check that every invocation of htmlspecialchars has the right arg list 2013-12-12 02:01:42 -08:00
friendica d7ee552c57 Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable. 2013-11-20 15:20:12 -08:00
friendica b233166d20 fix editpost which showed an encrypt button but no other buttons 2013-11-11 00:35:33 -08:00
friendica 7381326b7a provide expire feature on post and comments as well as private messages. This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone. 2013-11-07 00:47:50 -08:00
friendica 9b7994a9b7 remote post module so that from anywhere on the web or at least within the matrix you'll be able to share content or we can have apps on other sites that post status updates on your wall. All with your permission of course as you'll have to click "share" to actually post it. 2013-10-27 20:01:28 -07:00
Michael Johnston e9ffc46bd1 allow categories to be edited when editing a post 2013-09-03 21:14:18 -04:00
friendica 24b9799dca convert all stored json calls to json_decode_plus() 2013-08-06 03:54:49 -07:00
friendica c45ebdf97f missing include 2013-07-30 20:01:17 -07:00
friendica cb4d61e092 unencrypt private posts for editing 2013-07-30 19:05:34 -07:00
friendica 3b1e5e5204 source code re-org, move taxonomy to separate include 2013-06-19 21:50:14 -07:00
friendica f9fec7cf8f issue with auto permissions 2013-05-19 17:57:06 -07:00
friendica 952b2ef2ab . 2013-03-10 18:45:58 -07:00
friendica 8d71fe91f6 cleanup editpost 2012-12-21 04:08:48 -08:00
friendica 2752b58f33 plaintext default - richtext is a feature 2012-11-05 01:25:08 -08:00
friendica 5ff6e9348b a few minor changes 2012-08-26 23:05:00 -07:00
friendica c673c70c25 updates 2012-08-05 21:41:58 -07:00
friendica 4824e5b8b8 birthdays and events are now notifications 2012-07-29 18:29:27 -07:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica 75acc1ed96 support plaintext on editpost, editorinit called before all buttons laid out 2012-02-17 11:49:27 -08:00