Commit graph

13506 commits

Author SHA1 Message Date
friendica
e1b9053563 add last post to api/account/verify_credentials 2015-04-17 20:22:10 -07: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
e465a32168 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-04-17 11:20:43 +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
friendica
811cfc56d5 you need communications in there someplace. 2015-04-16 16:35:09 -07:00
friendica
507d04a987 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-16 15:41:43 -07:00
friendica
f09df06130 simplify 2015-04-16 15:41:27 -07: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
90d3a6c02d make rpost respect default post permissions 2015-04-16 11:15:04 +02:00
Mario Vavti
b42bb09635 whitespace 2015-04-16 10:46:59 +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
friendica
32f79374b0 don't show directory keywords widget if globaldir setting is off 2015-04-15 22:07:20 -07:00
friendica
4d31d22d5c nits 2015-04-15 17:10:31 -07:00
friendica
7febf1bf21 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-15 16:43:44 -07:00
friendica
d7cc07f5d7 more feature editing and an "redmatrix in a nutshell" overview for those that can't figure it out. 2015-04-15 16:42:55 -07:00
mrjive
2ba95e55a5 Merge pull request #313 from mrjive/master
Added the Item ID in the source view
2015-04-15 21:24:50 +02:00
mrjive
c8d131d8ce Added string for item ID in view source 2015-04-15 13:01:29 +02:00
mrjive
324fd61d7f Added string for item ID in view source 2015-04-15 12:59:22 +02:00
mrjive
a597c74b97 Update viewsrc.php
Adding the item ID to the item source view
2015-04-15 12:26:03 +02:00
mrjive
7b467d6ca7 Merge pull request #1 from redmatrix/master
2015-04-15_1
2015-04-15 11:19:25 +02:00
Mario Vavti
834044b15b title=>name 2015-04-15 09:20:27 +02:00
friendica
2c8394a4b9 funny I should mention comanche preview (yesterday) as clicking the view link on a layout does nothing interesting at all. So I've made it do a crude but useable preview with page content of 'Lorem Ipsum'. 2015-04-14 21:48:42 -07: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
friendica
89536ff88b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-14 16:22:59 -07:00
friendica
3a45206b99 default perms not being set in some cases 2015-04-14 16:22:33 -07: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
2001ad94bd dont suggest anything here it explains itself 2015-04-14 11:59:49 +02:00
Mario Vavti
79b5fb5b58 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-04-14 11:50:34 +02:00
Mario Vavti
bf2a97147e some more on webpages 2015-04-14 11:50:21 +02:00
friendica
584e9233d4 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-14 01:13:38 -07:00
friendica
338b80560f comanche preview is probably important 2015-04-14 01:13:12 -07:00
Habeas Codice
213ca7f8b5 unquote binary 2015-04-13 16:18:11 -07:00
friendica
d3bc721138 item_check_service_class wasn't returning correct results 2015-04-13 16:03:09 -07:00
friendica
f126116777 rev update 2015-04-13 15:48:11 -07: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
redmatrix
159525789a Merge pull request #312 from unary/pagedisplay
only add the h3 tag to the page if there is a title
2015-04-13 09:02:16 +10: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
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
friendica
e64de798b5 rev update, string update 2015-04-11 00:34:39 -07:00
Mario Vavti
8138373973 move style to style.css 2015-04-10 14:14:19 +02:00