Commit graph

1227 commits

Author SHA1 Message Date
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
2015-05-10 13:26:44 -07:00
Mario Vavti
ca36fce9a7 provide drop down submenu suggestions in edit mode 2015-05-10 21:17:37 +02:00
Mario Vavti
fad37eb6d0 copy/paste typo 2015-05-10 15:08:18 +02:00
Mario Vavti
616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
redmatrix
37a63365f1 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-07 16:44:28 -07:00
Mario Vavti
cd8ecb8649 provide wrap variable for comanche menus 2015-05-07 23:02:14 +02:00
redmatrix
90591bcbc9 missed one... 2015-05-06 22:56:08 -07:00
redmatrix
c186e6ed96 change notification colour 2015-05-06 21:25:59 -07:00
redmatrix
75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
Mario Vavti
2376d2140a fix block view 2015-04-29 21:43:41 +02:00
friendica
8711c223f3 version update 2015-04-28 13:14:15 -07:00
Mario Vavti
31b5b06e42 Provide webpage layout description 2015-04-25 22:35:24 +02:00
Mario Vavti
b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02:00
Mario Vavti
c6a75f407d webpages layout fixes 2015-04-24 11:36:49 +02: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
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
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
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
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
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
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
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
a73dbb3073 delete conv items on the fly in background 2015-04-08 14:10:38 +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
friendica
6199af6a79 revert iconic change to collection list widget 2015-04-01 01:07:38 -07:00
friendica
cff7696e98 change "create new collection" to iconic, document the account table 2015-03-30 00:51:03 -07:00
friendica
c29d3fc08a mod_connections ajax failure see http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression 2015-03-29 18:42:05 -07:00
Mario Vavti
b59e2870ab Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup. 2015-03-27 11:52:59 +01:00
friendica
47292c612c provide ways to over-ride the datetime pickers 2015-03-26 18:03:39 -07:00
friendica
75f3f4a808 admin config for default expiration 2015-03-25 17:43:02 -07:00
Mario Vavti
d6ad74c649 indicate new or updated items 2015-03-23 10:59:54 +01:00
Mario Vavti
9980645ab8 fix acl for if we have an cid in /network and make $bang better visible 2015-03-21 13:37:55 +01:00
Mario Vavti
ead45292e1 some tabs title statuseditor restructuring 2015-03-21 00:06:18 +01:00
Mario Vavti
ad9f5079cd do not destroy page layout if feature_encrypt is not enabled 2015-03-19 12:40:04 +01:00
friendica
7a9aca6ecb fix the map embed issue by keeping the map visible but moving it far off the screen. 2015-03-17 18:45:56 -07:00
Mario Vavti
8d89dde908 update templates 2015-03-17 15:12:21 +01:00
friendica
bc22df9057 display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out. 2015-03-16 22:06:03 -07:00
friendica
841f94ce2a regression: visual feedback that page/content is loading when affinity slider value changed went missing 2015-03-16 18:10:14 -07:00
friendica
2bd3dc6101 Merge https://github.com/friendica/red into pending_merge 2015-03-16 15:50:27 -07:00
friendica
52374bcd6e phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately. 2015-03-16 15:33:08 -07:00
Mario Vavti
4146f9d3da show generic submit button only if plugin name is provided 2015-03-16 21:19:27 +01:00
friendica
f507a5cd5a prepare for demise of google code 2015-03-12 16:05:56 -07:00
Klaus Weidenbach
c6162c4c88 Fix JavaScript problems on channels where you are not allowed to upload photos.
Add some try...catch blocks around JavaScript that throws errors.
This commit should fix the current problems that were introduced by an
earlier commit.
2015-03-12 22:57:00 +01:00
Mario Vavti
d11bec6f58 add generic_addon_settings template and minor fixes 2015-03-12 22:22:52 +01:00
Mario Vavti
8113ee1c4a some work on feature/addon settings 2015-03-12 10:19:56 +01: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
5b35f1e6c4 Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync. 2015-03-10 15:43:15 -07:00
Klaus Weidenbach
946beb6191 View upload photo button only if you have permission.
Check if post_photos permission is available otherwise hide the photo
upload button.
Or should we show the button and just disable it with a title, about
missing permission to upload photos?
In comments we use the same icon, but just add [img] bb-code. Should we
provide this if no permission to upload photos. Do we need different
icons for [img] and photo upload buttons?
2015-03-10 21:51:14 +01:00
Mario Vavti
637f0eba4f collapse jot tools to submenu on small and extra small screens 2015-03-10 13:20:10 +01:00
friendica
98dffd77ef channel delegation 2015-03-10 02:23:14 -07:00
friendica
4237e8052e buttons for admin_accounts + admin_channels 2015-03-09 20:40:02 -07:00
friendica
b2e33435f7 increase the cell padding (any jokes about padded cells will be ignored) 2015-03-09 20:00:20 -07:00
friendica
0134a41015 more work on queue optimisations 2015-03-09 19:57:35 -07:00
friendica
c3d20cfba9 Bring simple editor formatting functions back to the main editor (bold, italic, underline, quote, code) so as to maintain parity and consistency with comments. Currently this will make the editor toolbar seem a bit cluttered but be aware that the second button group (attach and link tools) will be reduced to two buttons (attach and link) when the next phase of this work is completed. The third group of tools are optional features and will only be presented based on personal choice. Visual editors may need to disable, relocate, or redefine these buttons. 2015-03-09 18:32:51 -07:00
friendica
26a414fe4b make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon 2015-03-09 16:27:12 -07:00
habeascodice
f7d1fb9c5a Merge pull request #920 from dawnbreak/master
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
2015-03-08 16:51:42 -07:00
Klaus Weidenbach
c6d45858bb Fixing (un)blocking accounts in /admin/users.
When I look at the instructions in sql_conventions about setting bit
flags I don't understand how this could have worked before. Changed the
behavior for (un)blocking so that it should work now.
2015-03-08 22:22:45 +01:00
Klaus Weidenbach
23ea974615 Add alert to admin page about old PHP version.
Add an alert message to admin summary page when a PHP version < 5.4 was
detected as this has reached EOL and will not be supported with the new
SabreDAV library.
Some styleguide optimisation.
Add NULL_DATE example to doc/sql_conventions.bb.
Display a "0" when no plugins active in summary page.
Added some more numbers to summary admin page, expired accounts,
channels. Hope I interpreted them right. I have no idea how to get
blocked accounts.
2015-03-08 17:51:58 +01:00
friendica
480dac1af2 add reddress to profile - but all is not as it seems. Copy to clipboard is blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy. 2015-03-07 23:35:56 -08:00
friendica
f6da235a7d major cleanup of directory options 2015-03-05 23:31:01 -08:00
friendica
22391a2437 straighten out some directory stuff, which required some Comanche structural changes 2015-03-05 18:24:49 -08:00
friendica
ec5c989352 make destructive queue management functions an expert option 2015-03-05 15:53:25 -08:00
Mario Vavti
ce229d73f8 whitespace and minor restructuring 2015-03-05 19:08:32 +01:00
Mario Vavti
688ef34d98 only show theme settings if we have any themes 2015-03-05 18:16:43 +01:00
Mario Vavti
44b74365dd restructure display settings 2015-03-05 17:12:27 +01:00
Mario Vavti
c62e4bcdca can not use element id more than once 2015-03-05 13:03:58 +01:00
Mario Vavti
3fa4123161 only allow theme selection forms if there are any themes to select 2015-03-05 12:47:18 +01:00
Mario Vavti
61f398e055 fix theme preview disappearing 2015-03-05 12:38:51 +01:00
Mario Vavti
beace0f57a more yes/no labels 2015-03-05 10:20:49 +01:00
friendica
068699ae31 missed removing a test case 2015-03-04 20:14:47 -08:00
friendica
2ea162136e the link icon on comments now calls the link parsing tool (just like the main editor window). Eventually the link specific icons (image, link, audio, video) will all be handled by inserting a link using the link icon (here and in the main editor window) and the separate buttons will go away. We also need to tie this to oembed so that there's one place to insert a link - no matter what kind of link it is, and we'll try to find the best way to render that as content. Similarly upload will upload content, no matter what kind of content; and we'll likewise try and figure out the best way to present whatever content was uploaded (img, file, audio, video, whatever). 2015-03-04 20:00:54 -08:00
friendica
ddaf5c067d cleanup mail buttons 2015-03-04 14:00:36 -08:00
Mario Vavti
e5e96dfbff cleanup removeaccount 2015-03-04 11:11:36 +01:00
Mario Vavti
431a462d60 cleanup removeme 2015-03-04 11:01:16 +01:00
Mario Vavti
eceafd5777 fix wording 2015-03-04 10:26:25 +01:00
Mario Vavti
4b08ccd873 clean up account settings 2015-03-04 10:11:48 +01:00
Mario Vavti
6d30abe4bf Accordionize feature settings 2015-03-04 09:54:33 +01:00
friendica
df90677f90 add the tag hijacking preference to Diaspora settings 2015-03-03 17:43:13 -08:00
friendica
52f42e7d81 Merge https://github.com/friendica/red into pending_merge 2015-03-03 14:39:03 -08:00
friendica
44b714d0eb group/collection edit page cleanup 2015-03-03 14:38:34 -08:00
Mario Vavti
6e0b5b742c login adjustment 2015-03-03 11:32:54 +01:00
Mario Vavti
74c1b61689 make remove channel button work again 2015-03-03 09:18:04 +01:00
Mario Vavti
6b467974a3 some more work on settings 2015-03-02 20:51:32 +01:00
friendica
bc1afbc762 Merge https://github.com/friendica/red into pending_merge 2015-03-01 15:57:56 -08:00
friendica
ba7bdd79b7 queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. 2015-03-01 15:55:27 -08:00
Mario Vavti
e8e6231a4e settings: missing /form and whitespace 2015-03-01 21:51:44 +01:00
Mario Vavti
ea6e86fecc more settings work 2015-03-01 21:45:49 +01:00
Mario Vavti
b4a2f764ab fix login 2015-03-01 16:21:32 +01:00
Mario Vavti
6e64f9af54 first pile of work on settings 2015-03-01 15:22:23 +01:00
friendica
a00c072f02 high level queue inspector - needs a lot more, like the ability to dump certain destinations and indicating known dead sites, but this is a start 2015-02-26 20:00:47 -08:00
friendica
5d57df2694 per Randal overheard on a foreign network - tab in post/comment edit window goes to submit instead of the next button. 2015-02-26 17:18:09 -08:00
friendica
dce0bb0ef8 finish converting "delete" to trash icons for consistency. The 'x' was left in a couple of places like the group list widget and saved search term widget and ignoring friend suggestions where it was more appropriate to leave it. 2015-02-26 16:41:38 -08:00
friendica
86aefe0e01 new session functions 2015-02-22 15:27:45 -08:00
friendica
e00be4de23 The Diaspora communications policies allow comments to public posts literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page. 2015-02-17 19:47:36 -08:00
friendica
533f39debe bring back like/dislike summaries on photos 2015-02-16 17:01:13 -08:00
friendica
1c4b919980 force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy. 2015-02-15 23:45:22 -08:00
friendica
8774089005 preparatory work for site ratings 2015-02-15 21:22:05 -08:00
friendica
0249fbb7e6 lost ability to delete events 2015-02-15 16:04:59 -08:00
marijus
7c45f23f8f some shifting to make button groups render properly 2015-02-13 12:37:05 +01:00
marijus
4616c13f3b yet another icon change 2015-02-13 10:40:52 +01:00
friendica
94a9aa9610 possibly better icons, possibly not. There is no [x]. 2015-02-12 14:54:53 -08:00
friendica
e8bdf2b8d7 more permissions tweaking 2015-02-10 21:21:18 -08:00
friendica
d010712517 wrong icons in list mode 2015-02-10 19:32:12 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
4632d30a78 more attendance 2015-02-10 14:47:09 -08:00
friendica
f7cce63447 cleanup event attendance - make sure it works in list mode. 2015-02-10 00:44:34 -08:00
friendica
81e7b47b76 more progress on event confirmations 2015-02-10 00:11:37 -08:00
friendica
c694945245 like formatting for extended consensus items 2015-02-09 21:18:50 -08:00
friendica
fce51876c9 bring some styling back to the colorbox and improve the event preview ability 2015-02-09 18:58:43 -08:00
friendica
ad731b7c7b make preview button larger 2015-02-09 16:00:46 -08:00
friendica
ed810a360f event form - provide map ability for location field and add preview ability 2015-02-09 15:57:22 -08:00
friendica
69894e28c4 we still need an event preview but this looks a lot better. 2015-02-08 20:23:02 -08:00
friendica
a1d84f96b6 first cut at putting editor tools in event form 2015-02-08 19:25:35 -08:00
friendica
e7a68eaef0 style the checkboxes in the event form 2015-02-05 21:01:02 -08:00
friendica
abcc70722c event form cleanup backported from trinidad - still need to style the checkboxes 2015-02-05 19:37:55 -08:00
friendica
68978ad1c0 collapse overly-verbose ratings 2015-02-05 15:28:46 -08:00
friendica
1b5bd1d808 increase size of rating value to make it stand out a bit. 2015-02-05 15:11:51 -08:00
friendica
561bab4ece remote rating and addition of rate-me to channel profile sidebar 2015-02-04 17:32:29 -08:00
friendica
3988948516 first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. 2015-02-04 15:48:39 -08:00
friendica
127bf82187 probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing. 2015-02-03 23:30:07 -08:00
friendica
4ead2cd79d final cleanup on ratings feature 2015-02-03 21:19:29 -08:00
friendica
17ffe122b3 ratings - mopping up, most everything but directory sync implemented 2015-02-03 18:10:55 -08:00
friendica
5cb2f55dbb rating form work 2015-02-03 16:52:09 -08:00
friendica
c417a43338 styling for the directory page when it comes to ratings 2015-02-03 15:50:12 -08:00
friendica
df632c4232 run ratingsearch on the server 2015-02-03 15:06:16 -08:00