harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,461 Commits 6 Branches 36 Tags
6679734135fb04f4a7beccb81663bf1e9574f062
Commit Graph

4605 Commits

Author SHA1 Message Date
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
Mario Vavti 9e490d022b fix webpage perms 2015-04-22 12:00:15 +02:00
friendica 2cef6c3ac5 use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos. 2015-04-21 21:41:39 -07:00
friendica 6bc2766d79 issue #162 2015-04-20 20:49:55 -07:00
friendica 53339d19a3 issue #176, sender copy of item not obscured if using private mention 2015-04-20 20:14:07 -07:00
friendica 3eeea9d8f0 force event obj_type on update 2015-04-20 17:02:45 -07:00
friendica 9cc8b44579 issue #157, provide default directory sort order 2015-04-19 23:04:14 -07:00
friendica 4383564777 doco updates 2015-04-19 21:39:45 -07:00
friendica d5f4a19a77 add favorites/create and destroy to api 2015-04-19 20:37:24 -07:00
friendica f315c55d32 api performance enhancer 2015-04-19 18:57:12 -07:00
friendica 185ce2da69 assorted fixes to api direct messages 2015-04-19 18:14:17 -07:00
friendica 6511d5ee2c some api cleanup 2015-04-19 17:39:17 -07:00
friendica 82f2765f7b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-19 13:41:38 -07:00
friendica 01efda6850 api - unobscure mail 2015-04-19 13:41:12 -07:00
Mario Vavti 71117628bc attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes 2015-04-19 15:22:50 +02:00
Mario Vavti dd5b97639e Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo 2015-04-19 13:25:05 +02:00
friendica 0883512e30 log this since we may need it to track down failures 2015-04-18 17:40:44 -07:00
friendica 0ce8572fef remove failed experiment 2015-04-17 23:04:58 -07:00
friendica e1b9053563 add last post to api/account/verify_credentials 2015-04-17 20:22:10 -07:00
Mario Vavti 61e4ee753d allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes 2015-04-17 11:20:22 +02:00
Mario Vavti 9addc4581e provide a separate input field for rpost attachments 2015-04-16 23:26:11 +02:00
friendica 32f79374b0 don't show directory keywords widget if globaldir setting is off 2015-04-15 22:07:20 -07:00
Mario Vavti 834044b15b title=>name 2015-04-15 09:20:27 +02:00
friendica 9942dec09c match parens 2015-04-14 20:52:07 -07:00
friendica 32acb7f6e1 post_activity_item incorrectly setting the obj_type when a valid type was specified 2015-04-14 20:50:38 -07:00
Mario Vavti 2001ad94bd dont suggest anything here it explains itself 2015-04-14 11:59:49 +02:00
Mario Vavti bf2a97147e some more on webpages 2015-04-14 11:50:21 +02:00
Mario Vavti 22c3202f22 remove widget class from webpage blocks and make titles h2 to match the rest of the matrix 2015-04-13 16:17:10 +02:00
Mario Vavti 70b109702e make dropItem more universal and move delete up in the dropdown menu 2015-04-12 14:30:33 +02:00
Mario Vavti 962fdf08c0 make fs deletion of directories work 2015-04-12 13:58:04 +02:00
Mario Vavti 7c8b9397ae reverse file activity logic 2015-04-12 13:13:22 +02:00
Mario Vavti 8138373973 move style to style.css 2015-04-10 14:14:19 +02:00
Mario Vavti 5457b417f8 make r# work better with different font sizes 2015-04-10 14:01:40 +02:00
friendica d9807e34e5 don't warn folks about the webaddress observer tag. We need it in constructed urls. 2015-04-09 22:35:04 -07:00
friendica 8f22b927b1 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-09 19:52:19 -07:00
friendica 3fd2e4b716 program the affinity slider labels 2015-04-09 19:51:58 -07:00
Klaus Weidenbach fdd6508019 Some documentation and whitespaces at line endings. 2015-04-10 00:28:23 +02:00
Mario Vavti 7e7678364b make jRange behave again 2015-04-09 10:53:37 +02:00
friendica 4fd80304a5 that didn't work out well - let's do this instead 2015-04-08 23:20:28 -07:00
friendica 4289c8adb2 fix selector when sys channel active 2015-04-08 23:12:39 -07:00
friendica 7bec4b313a system channel always has allow_code privileges 2015-04-08 23:05:36 -07:00
friendica 37afc81847 update features, allow sys account page deletion 2015-04-08 17:54:52 -07:00
Klaus Weidenbach f03a937c4e Renamed some functions to match other names in bbcode.php. 
Some documentation.
Removed unused variables.
Removed empty spaces at line endings.
 2015-04-07 22:47:36 +02:00
Habeas Codice dbb3cda9a6 missed one 2015-04-07 05:45:24 -07:00
Habeas Codice 1162af4c0d "PHP Strict Standards: Only variables should be passed by reference" 2015-04-07 05:42:47 -07:00
friendica 3c05af6553 make open tag work correctly for multiple invocations in the same text 2015-04-06 21:26:40 -07:00
friendica 3a3563a4b1 commit 59828593c broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted. 2015-04-06 19:00:13 -07:00
Klaus Weidenbach 754ac2cff7 Fix Design Tool navigation for sys channel. 
Fix creating menu for sys channel.
 2015-04-06 23:52:13 +02:00
jeroenpraat c2517eca56 Update/fix Dutch and removing an ugly space 2015-04-02 02:23:26 +02:00
friendica 41e7552225 open bbcode tag 2015-04-01 12:30:03 -07:00