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

4351 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 c696860cc5 webpages blocks fixes 2015-04-23 21:04:01 +02:00
Mario Vavti b4dff3a9ff provide headings for blocks and layouts 2015-04-22 10:31:36 +02:00
Mario Vavti 09096811ca missing class 2015-04-21 23:30:12 +02:00
Mario Vavti ba524e1a72 move .lockview to style.css and a typo 2015-04-21 23:27:30 +02:00
Mario Vavti c52682c68f missing dropdown class 2015-04-21 23:21:09 +02:00
Mario Vavti e58e8f3f75 bring lockstate to webpages 2015-04-21 23:08:54 +02:00
Mario Vavti 21704ecb93 bring lockview to menu items, slightly change the way /lockview is called 2015-04-21 22:45:54 +02:00
Mario Vavti 0bd9fe0b11 rework and hopefully improve webpage menu creation workflow 2015-04-21 10:05:26 +02:00
friendica 6bc2766d79 issue #162 2015-04-20 20:49:55 -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
Mario Vavti 11b7fedd29 css fix 2015-04-18 16:23:14 +02:00
Mario Vavti 3ee78398aa fix page-title margin 2015-04-18 13:32:40 +02:00
friendica 9f35971860 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-17 17:21:10 -07:00
friendica 3d99a6b5c4 hide event share button when editing an event 2015-04-17 17:20:24 -07:00
Mario Vavti c02ff823f6 adjus webpage font size to match conv item font size 2015-04-17 13:53:09 +02: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 10cc643f65 wording and css fixes 2015-04-16 23:46:12 +02:00
Mario Vavti 9addc4581e provide a separate input field for rpost attachments 2015-04-16 23:26:11 +02:00
Mario Vavti 86ac9c0d6b move share webpage element from editwebpage to webpages and make it shareable with rpost 2015-04-16 10:43:14 +02:00
mrjive 324fd61d7f Added string for item ID in view source 2015-04-15 12:59:22 +02:00
Mario Vavti 834044b15b title=>name 2015-04-15 09:20:27 +02:00
Mario Vavti 953819e7da css fixes and remove expert mode for block page content type 2015-04-14 12:52:31 +02:00
Mario Vavti bf2a97147e some more on webpages 2015-04-14 11:50:21 +02:00
Mario Vavti 865b602cf8 webpages appearence 2015-04-13 23:38:36 +02:00
Mario Vavti 05f018e509 add bs classes to design tools menu 2015-04-13 17:24:37 +02:00
Mario Vavti aeb162e963 remove superfluous view/preview buttons 2015-04-13 16:49:08 +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
Michael Johnston 6e633924bd only add the h3 tag to the page if there is a title 2015-04-12 17:24:32 -04:00
Mario Vavti c6873529f4 bring ajax delete to files 2015-04-12 15:01:06 +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 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 a3b18adbcb bring ajax item delete to conv list 2015-04-10 09:30:43 +02:00
friendica 3fd2e4b716 program the affinity slider labels 2015-04-09 19:51:58 -07:00
Mario Vavti 7e7678364b make jRange behave again 2015-04-09 10:53:37 +02:00
Mario Vavti a73dbb3073 delete conv items on the fly in background 2015-04-08 14:10:38 +02:00
Mario Vavti b3f80c049f update jquery to 1.11.2 2015-04-08 10:46:46 +02:00
Mario Vavti 549bcf5a72 this is easier on the eyes when collapsing a long post/comment 2015-04-08 08:53:28 +02:00
friendica 5bc7c0e798 add endless scroll to viewconnections module 2015-04-06 22:36:46 -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
friendica 04c993ff2a now add back the navsearch param 2015-04-06 16:18:35 -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 6199af6a79 revert iconic change to collection list widget 2015-04-01 01:07:38 -07:00
friendica 68c1aac1e3 make search box border radius consistent with everything else. It looks really weird when it's so different. 2015-03-31 19:02:02 -07:00
friendica 7f6ba91dfa allow webpage for home to use its own layout file 2015-03-31 17:52:03 -07:00
Paolo T 642ab1c256 Merge pull request #945 from tuscanhobbit/dev 
Italian translation
 2015-03-30 20:14:01 +02:00
tuscanhobbit aecd2432b0 Italian translation 2015-03-30 20:10:38 +02:00