Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 18:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17540 commits 7 branches 30 tags 160 MiB
Commit graph

1732 commits

Author SHA1 Message Date
Mario Vavti
78a70fed2f fix css issue in directory 2015-12-06 16:37:57 +01:00
Mario Vavti
593423434c fix attachment rendering for mail 2015-12-02 09:44:25 +01:00
Mario Vavti
7db86a4e05 css fixes 2015-11-28 14:47:17 +01:00
Mario Vavti
122d7281f7 fix tpl if clause 2015-11-28 11:04:33 +01:00
Mario Vavti
fce1dc083b add templates 2015-11-27 22:53:36 +01:00
Mario Vavti
bcfa72ed31 move events tools to aside widget 2015-11-27 22:45:28 +01:00
Mario Vavti
e569f5d6eb unset does not work in webkit browsers 2015-11-27 14:00:37 +01:00
Mario Vavti
ee153f64d4 add spinner to events 2015-11-27 13:32:20 +01:00
Mario Vavti
a73c385831 lost calendar icon 2015-11-26 23:29:49 +01:00
Mario Vavti
91b35c5349 various css fixes 2015-11-26 23:19:06 +01:00
Mario Vavti
056db37c66 beautify event item code 2015-11-26 22:14:20 +01:00
Mario Vavti
5cb71fa5da default timepicker to 15 min steps. abbr -> span 2015-11-26 21:00:04 +01:00
Mario Vavti
8a269823d2 improve event rendering 2015-11-26 20:53:42 +01:00
Mario Vavti
c407e72dcc add location 2015-11-26 16:40:40 +01:00
Mario Vavti
8e3b796a2f fix event rendering 2015-11-26 16:38:14 +01:00
Mario Vavti
c7cbd41c16 first iteration on the event item 2015-11-26 12:26:27 +01:00
Mario Vavti
3ea84d7eab some basic event styling 2015-11-25 22:55:07 +01:00
Mario Vavti
a80c45940e add a if clause for the case we do not have a finish date 2015-11-25 19:02:48 +01:00
Mario Vavti
ab71e33d83 note to self: do not make things more complicated than they need to be. 2015-11-25 17:28:26 +01:00
Mario Vavti
fe57e7059b events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted 2015-11-25 15:05:21 +01:00
Mario Vavti
1767a07f4d efent form template fixes 2015-11-24 19:18:26 +01:00
Mario Vavti
f520cd92d0 open form on dbl-click 2015-11-24 14:33:23 +01:00
Mario Vavti
987619130b some event heavy lifting - please test and report issues 2015-11-24 14:15:28 +01:00
redmatrix
34b804e9dc Merge pull request #182 from anaqreon/url-selected 
Place link around selected text
 2015-11-24 09:41:55 +11:00
redmatrix
a7e4553ea7 delivery report tweaks 2015-11-22 17:12:30 -08:00
Mario Vavti
d726c921eb make calendar week start (sun or mon) configurable 2015-11-21 15:33:57 +01:00
Andrew Manning
fee8503093 Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected 2015-11-20 21:57:10 -05:00
Andrew Manning
6083cd2559 If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs. 2015-11-20 21:55:13 -05:00
Mario Vavti
a3e47d26f6 make calendar language aware 2015-11-20 16:39:55 +01:00
jeroenpraat
c7652fc29c Had to switch these 2. Sorry. 2015-11-20 00:50:54 +01:00
Mario Vavti
ba52af786e move today button from aside to section title 2015-11-19 11:38:34 +01:00
Mario Vavti
b23284cba2 move moment.min.js and remove unneeded files 2015-11-18 23:56:25 +01:00
Mario Vavti
e4145deeb7 some events refacturing 2015-11-18 23:50:42 +01:00
Mario Vavti
6fa0807550 more css fixes 2015-11-17 23:01:24 +01:00
Mario Vavti
b531486dab show jotnets toggle button only if there are jotnets and whitespace fixes 2015-11-17 10:46:38 +01:00
jeroenpraat
def5edf93c nl+es and some other bits 2015-11-14 20:43:34 +01:00
redmatrix
93e5449c08 really basic photo album widget for content regions 2015-11-12 20:22:36 -08:00
redmatrix
7d5acef20a remove list bullets from extended like list 2015-11-09 15:18:26 -08:00
jeroenpraat
b99b6b5ae9 This is better 2015-11-09 16:37:22 +01:00
jeroenpraat
cda81e35db Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed. 2015-11-09 15:08:50 +01:00
redmatrix
4e1c308162 make jotnets modal 2015-11-08 17:48:43 -08:00
Tobias Luther
8639eda70f Quick fix: Moved Twitter select box to the top of ACL selector 2015-11-08 12:20:58 +01:00
jeroenpraat
0db5a8673d Firefox share (that seems now the official name) button added to misc. settings. 2015-11-05 16:20:56 +01:00
jeroenpraat
1c0fe89368 Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates. 2015-11-04 22:52:40 +01:00
redmatrix
e09b49288f provide admin setting to change directory server 2015-11-03 18:34:16 -08:00
Mario Vavti
43d8090182 timeago() works best with iso format. fix #118 2015-11-03 11:19:22 +01:00
redmatrix
d3183467e0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-01 15:52:35 -08:00
redmatrix
b62614bbd4 improve /locs page with some field notes and the ability to do a forced sync 2015-11-01 15:51:45 -08:00
jeroenpraat
618155e6ab More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file. 2015-11-01 22:59:32 +01:00
Mario Vavti
0353b0e04f Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-01 11:17:04 +01:00
jeroenpraat
3262d819de update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. 2015-10-31 22:34:59 +01:00
Mario Vavti
5920a96da7 make attachments appear in a dropdown in wall-item-tools-left 2015-10-31 00:38:01 +01:00
redmatrix
96402a2354 This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff. 2015-10-29 01:23:56 -07:00
jeroenpraat
605381f83d More fine tuning bluegrid schema. Extra generic-wrapper-styled. 2015-10-27 22:52:54 +01:00
Mario Vavti
71f70b4377 css fixes 2015-10-27 12:52:21 +01:00
jeroenpraat
02527552fd Better -styled. 2015-10-27 01:23:30 +01:00
jeroenpraat
ac5b9f2382 Another .generic-content-wrapper 2015-10-27 01:20:48 +01:00
jeroenpraat
35857931ef 2 more tpl files with generic-content-wrapper-styled 2015-10-26 22:47:47 +01:00
Mario Vavti
4fb9571136 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-26 14:20:06 +01:00
Mario Vavti
e70bb371d9 bring back item transparency 2015-10-26 14:19:46 +01:00
jeroenpraat
2099ac0615 Revert this one. This was hub specific. 2015-10-26 14:16:05 +01:00
jeroenpraat
5e28b1216e Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that. 2015-10-26 14:05:45 +01:00
jeroenpraat
e858ee811b Fixed connection page. Page was overcrowded on systems with larger fonts. 2015-10-26 13:57:12 +01:00
redmatrix
a498fc8e72 looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings. 2015-10-25 21:17:02 -07:00
redmatrix
917d0ced4a new feature: delayed posting 2015-10-25 16:54:18 -07:00
Mario Vavti
ab8b4d5c36 another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload 2015-10-24 21:44:25 +02:00
Mario Vavti
9ae215291f fix app.tpl missing </div> tag if not authenticated 2015-10-23 10:20:01 +02:00
Mario Vavti
ed6629002f photo object fixes 2015-10-22 13:01:33 +02:00
Mario Vavti
bcb4ac7aae experiment: put the photo-item photo on top of the post 2015-10-22 12:58:11 +02:00
Mario Vavti
6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it 2015-10-22 10:52:10 +02:00
Mario Vavti
232742a5e6 warn if quota exceeds 90% of storage limit 2015-10-21 12:52:03 +02:00
Mario Vavti
a33ddf373b move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation 2015-10-21 12:40:09 +02:00
redmatrix
38816d7e41 move quota display to where it's visible on a tablet 2015-10-20 18:48:14 -07: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
Paolo Tacconi
8da8e02dc8 Replaced some old redmatrix branding 2015-10-19 10:51:33 +02:00
redmatrix
1d2797dc1f bring back chat expiration setting and adjust chat size for our now smaller content region 2015-10-17 14:54:27 -07:00
Mario Vavti
1593ebec1f update conv_list.tpl 2015-10-15 11:49:33 +02:00
Mario Vavti
2413968021 double up default photo sizes - even the mos simple camera can now do images > 1024px 2015-10-15 11:20:56 +02:00
Mario Vavti
2848f5dab4 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-15 09:36:51 +02:00
redmatrix
de697a4267 issue #86 - like/dislike in photos not working 2015-10-14 14:16:16 -07:00
Mario Vavti
b4e83b6537 allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. 2015-10-14 22:14:19 +02:00
Mario Vavti
c963aa98e8 some conv-item restructuring to allow full width elements 2015-10-11 22:32:06 +02:00
Mario Vavti
05050381d3 bring our bbcode tools to private mail 2015-10-05 12:26:04 +02:00
Mario Vavti
2e45b41902 do not show delete conversation in single message view 2015-10-04 19:58:20 +02:00
Mario Vavti
7776c56c6c bring single message view to inbox/outbox view 2015-10-04 19:51:23 +02:00
Mario Vavti
4decceea76 add anchors to messages and links 2015-10-04 14:07:05 +02:00
Mario Vavti
26b97722c6 remove check mail - it just reloads the page. we get a notification in the panel if we get new mail 2015-10-04 13:43:16 +02:00
Mario Vavti
5ba39fef9a private mail compositor changes 2015-10-02 17:51:37 +02:00
Mario Vavti
9b8aa8d09e whitespace 2015-10-02 12:26:12 +02:00
Mario Vavti
3bed94f4ad move mail item buttons/menu to dropdown 2015-10-02 12:20:33 +02:00
Mario Vavti
a895a0d79e private mail template and css fixes 2015-10-02 11:41:37 +02:00
redmatrix
e7131bc8f8 this is an even better fix for issue #61 2015-09-30 22:10:26 -07:00
redmatrix
1df1c15e48 issue #61 - provide un-useable icons as placeholders for location setting options on deleted hublocs 2015-09-30 21:59:33 -07:00
redmatrix
526bc36b40 update the opensearch template 2015-09-30 19:31:25 -07:00
redmatrix
9bdb7bef5d add delivery reports to mail (not backported to redmatrix) 2015-09-30 19:27:53 -07:00
Mario Vavti
6368b09337 a clear is needed after floating 2015-09-28 21:51:04 +02:00
Mario Vavti
b97102da01 private mail: bring additional inbox/outbox views and ajaxify single message drop 2015-09-28 17:40:38 +02:00
Mario Vavti
d6293730fc private mail: some work on conversations view 2015-09-25 23:26:28 +02:00
redmatrix
ba94f824b9 deliveries per process ui for setting 2015-09-25 01:31:58 -07:00
redmatrix
2fe3d16bbe Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-24 16:58:32 -07:00
redmatrix
2844f276b9 Document the additional content export options 2015-09-24 16:57:17 -07:00
Mario Vavti
b9723aa85b some heavy private mail restructuring - work in progress 2015-09-24 14:07:44 +02:00
redmatrix
2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -07:00
redmatrix
9baaa6fa56 issue #51 2015-09-21 20:05:54 -07:00
redmatrix
d2565d0f61 looks like chat has been neglected a bit recently 2015-09-20 21:37:18 -07:00
redmatrix
f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. 2015-09-18 01:53:04 -07:00
Mario Vavti
c6c18261a0 missing refernce to array 2015-09-17 19:33:44 +02:00
Mario Vavti
1cf404177d quickfix for private messages - needs a lot more work 2015-09-17 19:25:13 +02:00
Mario Vavti
6cd5826d21 Revert "moved submit button to the bottom in settings.tpl" 
This reverts commit 1500691cc2.
 2015-09-17 15:05:40 +02:00
redmatrix
30af694e30 Merge pull request #44 from mrjive/move_submit_button 
moved submit button to the bottom in settings.tpl
 2015-09-17 10:19:43 +10:00
mrjive
1500691cc2 moved submit button to the bottom in settings.tpl 2015-09-16 04:46:47 -07:00
mrjive
fae5ea749a added toggle_select 2015-09-16 02:25:44 -07:00
redmatrix
63a1d8d0db make sure we've got a doc type 2015-09-15 01:39:38 -07:00
jeroenpraat
dfd4115f7a Update siteinfo.tpl 2015-09-14 16:45:15 +02:00
redmatrix
03e3281beb mod_locs - put the primary into a (non-functioning) button for visual consistency. 2015-09-13 20:15:33 -07: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
2f52b6c164 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-07 04:06:27 -07:00
Mario Vavti
ee21d87d1b uexport template fixes 2015-09-04 09:33:34 +02:00
redmatrix
fb2d2c5585 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-02 21:59:44 -07:00
redmatrix
3e7edf504d sort out some app display weirdness 2015-09-02 21:35:49 -07:00
redmatrix
1ce8ce896b provide consistent ui for things 2015-09-01 19:27:41 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix
2d471e39dc this is weird 2015-08-25 19:23:21 -07:00
redmatrix
2a59392ba8 change name of module 2015-08-22 19:31:39 -07:00
redmatrix
6590ca02de some event related fixes and some base work for implementing native tasks (to-do lists); which should already be importable and exportable. 2015-08-20 16:49:13 -07:00
redmatrix
abe362bdd4 issues encountered whilst testing import_items module using yearly dump files 2015-08-17 21:56:55 -07:00
redmatrix
1a4a921528 provide module for importing yearly content dumps 2015-08-17 21:40:40 -07:00
redmatrix
30fd17c58d Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	view/nl/messages.po
 2015-08-17 16:14:15 -07:00
redmatrix
98eeff7538 commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css 2015-08-17 16:11:10 -07:00
redmatrix
b737e224b1 more work separating Diaspora from core 2015-08-03 16:52:51 -07:00
redmatrix
c1a953f960 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-31 15:45:13 -07:00
redmatrix
5e985ef34f consistency of event form 2015-07-31 15:42:52 -07:00
redmatrix
cbb6d37b6c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-27 20:59:37 -07:00
redmatrix
52ccbd6b64 align buttons on event calendar 2015-07-27 20:58:25 -07:00
redmatrix
3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-27 18:01:20 -07:00
redmatrix
85f546e691 crude but more or less functional event import from thunderbird ics files 2015-07-26 22:44:49 -07:00
redmatrix
3880b485cb Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
	view/pt-br/messages.po
	view/pt-br/strings.php
 2015-07-26 16:50:33 -07:00
Mario Vavti
f6142d18c4 Provide connection status if status is "a-normal" 2015-07-26 20:54:09 +02:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/to_do_code.bb
 2015-07-21 17:13:48 -07:00
Mario Vavti
4d45bc9da1 Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. 2015-07-20 21:01:11 +02:00
Mario Vavti
464625cd91 show icons instead of disabled checkboxes 2015-07-20 15:03:55 +02:00
redmatrix
15b6e8faa4 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
 2015-07-19 21:08:34 -07:00
Mario Vavti
39a09eb525 fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos 2015-07-16 22:04:52 +02:00
redmatrix
6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
Mario Vavti
0c77a127f2 show inherited state in Connection Default Permissions 2015-07-15 14:03:34 +02:00
redmatrix
e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
Mario Vavti
104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti
4fe64179c8 disable the inherited checkboxes for notself 2015-07-14 19:29:49 +02:00
Mario Vavti
cc1764989f fix mod_connedit.js after cleanup 2015-07-14 17:37:33 +02:00
Mario Vavti
f267bd55d6 revert this until further investigation 2015-07-14 14:20:23 +02:00
Mario Vavti
7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix
6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
Mario Vavti
f81874ca49 fix sys channel menu in a morre standard way 2015-07-12 01:04:57 +02:00
Mario Vavti
d8f03450e7 make menu creation for sys channel work 2015-07-12 00:40:12 +02:00
redmatrix
a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
 2015-07-10 14:27:41 -07: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
Mario Vavti
115c18353e move profile image up and refine the aside width 2015-07-09 14:44:24 +02:00
Mario Vavti
efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix
6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
Mario Vavti
f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
Mario Vavti
adfb4072e8 various css fixes 2015-07-07 12:13:15 +02:00
Mario Vavti
807471d2a5 move if clause outside of the div 2015-07-07 09:56:30 +02:00
Mario Vavti
ee01e67fa7 use default style for default webpage 2015-07-07 09:41:27 +02:00
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
 2015-06-28 22:33:13 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix
b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
Mario Vavti
e9cc06dc11 directory: only provide connect button if we are not already connected 2015-06-24 21:12:20 +02:00
redmatrix
833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
Mario Vavti
b6c4601d8f some work on directory 2015-06-23 13:06:22 +02:00
Mario Vavti
a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02:00
redmatrix
ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	util/messages.po
 2015-06-21 20:51:07 -07:00
redmatrix
68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
Mario Vavti
c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. 2015-06-21 17:53:44 +02:00
Mario Vavti
8b563951ff more generic-content-wrapper and some css fixes 2015-06-19 15:49:06 +02:00
Mario Vavti
1432b1e83f cloud.tpl 2015-06-19 12:45:18 +02:00
Mario Vavti
de84f48e2f bring some more generic-content-wrappers and fix some of them 2015-06-19 12:44:11 +02:00
redmatrix
2963be60e5 more photos work 2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5 lots of work on merging photo and file albums/folders 2015-06-17 17:44:31 -07:00
redmatrix
8c7472c6c3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-15 17:30:08 -07:00
Mario Vavti
905cd1da5b do not allow/show acl button on photo edit if not owner 2015-06-15 13:04:16 +02:00
redmatrix
5733491ac8 more work on items 
and

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
 2015-06-11 17:56:56 -07:00
Mario Vavti
c8fe408a62 fix rendering of affinity slider 2015-06-11 11:35:21 +02:00
redmatrix
eb6a1f8387 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-09 19:39:21 -07:00
redmatrix
9592f7f3e6 put mirror_frontpage setting into admin/site 2015-06-09 19:37:12 -07:00
redmatrix
d08c43d80c toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled. 2015-06-09 18:50:11 -07:00
redmatrix
03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
 2015-06-09 16:52:00 -07:00
redmatrix
3c5a5a9ebf more frontpage tweaks 2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f reverse logic of homepage login setting 2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a frontpage tweaks 2015-06-07 18:15:26 -07:00
redmatrix
ec1dcb8f2e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-06-06 17:31:22 -07:00
jeroenpraat
93237f8d0a Added translatable strings to the Display Settings page and refreshed util/messages.po. 2015-06-06 19:49:30 +02:00
redmatrix
f3b95f591a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-31 19:26:00 -07:00
Mario Vavti
d11d130021 add some yes/no labels and minor template fixes 2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763 some fixes to make menu sharing work and expose it in the ui. 2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b show created/edited dates for menus 2015-05-29 11:07:57 +02:00
redmatrix
675aa96f22 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-25 17:01:02 -07:00
redmatrix
23abfb0a5b add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page. 2015-05-25 16:56:28 -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
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
friendica
6067274b51 start to tie ratings to the directory page 2015-02-02 23:58:44 -08:00
marijus
c29483b88c respect parent dir permissions 2015-02-02 15:18:44 +01:00
RedMatrix
b381579959 Merge pull request #881 from cvogeley/master 
Add allowed and not allowed emails to the UI in the
 2015-01-30 18:14:10 +11:00
friendica
3e22de0be0 how did that stuff merge? grrrr.... 2015-01-29 18:17:24 -08:00
friendica
df6d54c64e Merge branch 'master' into pocorate 2015-01-29 15:21:19 -08:00
Christian Vogeley
f81df92ef8 Add allowed and not allowed emails to the UI in the 
admin menu
 2015-01-29 20:27:35 +01:00
RedSwede
06291c6f42 non-tested fix for issue 847 2015-01-29 16:22:14 +01:00
friendica
fd0b6c967f Merge branch 'master' into pocorate 2015-01-29 00:28:23 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
da842da683 Merge branch 'master' into pocorate 2015-01-28 16:06:36 -08:00
marijus
f455036905 show shared button only to local user 2015-01-28 09:49:36 +01:00
friendica
f0b900057a first cut at direntry template, right now just provide a mockup with a slider and rating count to look at. 2015-01-27 16:51:13 -08:00
marijus
17c684e123 tpl and css cleanup 2015-01-27 19:33:30 +01:00
marijus
65aa6cf708 move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme 2015-01-27 19:00:16 +01:00
friendica
505d530d28 we also don't need a profile selector when editing our default permissions. 2015-01-25 14:32:00 -08:00
friendica
03412e8a58 don't hide the scary stuff when editing self permissions. 2015-01-25 14:28:48 -08:00
friendica
0125e9d288 Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs. 2015-01-25 14:06:57 -08:00
friendica
b3370243e8 move connection approval checkbox to top of page (above the sliders) - instead of being in between rating and rating text. 2015-01-25 12:35:57 -08:00
marijus
e874376268 this will require more fixing in include/enotify 2015-01-23 02:09:28 +01:00
friendica
b946ac63a1 couple of hubloc manager issues 2015-01-21 19:09:12 -08:00
marijus
43326a26b7 css fixes - hopefully 2015-01-20 22:19:51 +01:00
marijus
5ee815b2fa satisfy the floated images 2015-01-20 21:10:41 +01:00
marijus
1c2d956d7f basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete() 2015-01-18 14:44:58 +01:00
friendica
dfe31dc3b7 more heavy lifting on poco rep 2015-01-15 19:05:42 -08:00
friendica
597b07e8cc poco rating - add a test module for pulling out ratings 2015-01-15 17:32:41 -08:00
friendica
e7932d97a2 editing stuff for poco reputation 2015-01-15 16:37:47 -08:00
friendica
1c9299ed42 more backend work on poco rating 2015-01-15 14:05:18 -08:00
friendica
e528483d81 hide friends broken, add parameter for item search by verb 2015-01-13 14:42:54 -08:00
friendica
580c30f516 another attempt to explain default permissions on connedit page 2015-01-11 21:18:29 -08:00
Stefan Parviainen
4e3aadc38a Rename some stuff related to autocomplete 2015-01-07 18:57:16 +01:00
Stefan Parviainen
b320b8cbf3 Replace fancybox with colorbox 2015-01-05 19:49:20 +01:00
Stefan Parviainen
128b0008ee Replace jslider with jRange 2015-01-05 18:30:12 +01:00
Stefan Parviainen
c14dc699ae Fix initEditor on non-wall pages 2015-01-05 00:28:42 +01:00
Stefan Parviainen
57809f20a4 Sorting of autocomplete 2015-01-04 14:23:23 +01:00
Stefan Parviainen
386f361855 Autocmplete suggestions for non-local users, also suggest from visited channel's connections 2015-01-04 12:54:23 +01:00
friendica
9433a0ddc8 Merge https://github.com/friendica/red into pending_merge 2015-01-04 00:48:17 -08:00
friendica
028dff44cc remove hard-coded url to caterva.eu from events code. 2015-01-04 00:47:44 -08:00
marijus
0779e3ae53 provide some info for buttons 2015-01-03 13:42:05 +01:00
friendica
31648d65c8 some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. 2015-01-02 19:20:52 -08:00
Stefan Parviainen
42773a1122 Reworked switch to also display text 2015-01-02 18:14:23 +01:00
RedMatrix
e7081db19b Merge pull request #807 from pafcu/dblclicknewevent 
Double click on day in calendar creates new event starting that day
 2015-01-02 12:11:08 +11:00
RedMatrix
817b54688e Merge pull request #805 from pafcu/moretpl 
Move some HTML out to templates
 2015-01-02 12:10:50 +11:00
Stefan Parviainen
1c2dc97a4a Double click on day in calendar creats new event starting that day 2015-01-01 18:19:17 +01:00
Stefan Parviainen
85e76773a0 Use grouped select field for role selection 2015-01-01 15:54:16 +01:00
Stefan Parviainen
686b6ee118 Use grouped select field for timezone selection 2015-01-01 14:44:50 +01:00
Stefan Parviainen
ef94747e5e Add field template for grouped selects 2015-01-01 14:36:17 +01:00
Stefan Parviainen
ef6680f7ad Possibly make switches work on IE8 (untested) 2015-01-01 11:33:00 +01:00
Stefan Parviainen
70f0019905 Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic 2015-01-01 10:08:20 +01:00
RedMatrix
b7d758fed0 Merge pull request #795 from pafcu/tplcleanup 
Remove some old, unused templates
 2014-12-31 10:22:12 +11:00
RedMatrix
4a82967639 Merge pull request #791 from pafcu/notifications 
Improved notifications
 2014-12-31 10:21:38 +11:00
marijus
4edc9a696b design fixes for photos, files and random fixes 2014-12-30 21:04:48 +01:00
Stefan Parviainen
e6a3ea2c95 Make showing wall posts, intros and private messages under Notices optional 2014-12-30 15:27:33 +01:00
Stefan Parviainen
12e6d98659 Remove some old, unused templates 2014-12-30 14:11:27 +01:00
marijus
6cbbe854d5 css fixes 2014-12-30 12:12:55 +01:00
RedMatrix
619733e297 Merge pull request #789 from pafcu/chanman 
Don't show current channel separately in channel manager, highlight it i...
 2014-12-30 08:57:37 +11:00
marijus
f2bfdf0c76 some work on cloud actionspanel and minor cleanup 2014-12-29 22:45:07 +01:00
Stefan Parviainen
e69e59d260 Don't show current channel separately in channel manager, highlight it instead 2014-12-29 22:07:40 +01:00
Thomas Willingham
a70e42edac Remove link to hubloc status in admin panel. This is a potentially useful tool, 
but plain doesn't work at the moment.
 2014-12-29 14:47:41 +00:00
RedMatrix
7b98a6fcb0 Merge pull request #772 from pafcu/chanman 
Some work on the channel manager
 2014-12-29 09:29:12 +11:00
marijus
fa23439b9c more files css fixes 2014-12-28 20:46:16 +01:00
marijus
1ab23061df files css fixes 2014-12-28 20:34:12 +01:00
marijus
801ab709ad more work on files 2014-12-28 18:16:27 +01:00
Stefan Parviainen
40a327b68f Allow quick access to mail and connections from Channel Manager 2014-12-27 14:06:09 +01:00
Stefan Parviainen
6a679d26ce Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) 2014-12-27 13:36:05 +01:00
marijus
0cb0c2b1bf more work on files 2014-12-27 10:10:56 +01:00
Stefan Parviainen
fa65d31f3f Move app icon centering to style.css 2014-12-22 23:09:10 +01:00
Stefan Parviainen
c819c276f0 Remove unused apps.tpl 2014-12-22 19:05:16 +01:00
Stefan Parviainen
37534d110c Center app names 2014-12-22 18:53:13 +01:00
friendica
d3830aea96 provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. 2014-12-21 18:40:25 -08:00
RedMatrix
c732b72a0d Merge pull request #757 from git-marijus/master 
files: make mod/filestorage.php load via ajax and some design work. work...
 2014-12-22 09:45:33 +11:00
marijus
be1891c058 fix button visibility 2014-12-21 21:48:10 +01:00
marijus
02328bfdbe forgot to git add files 2014-12-21 20:27:43 +01:00
marijus
27d786c979 files: make mod/filestorage.php load via ajax and some design work. work in progress... 2014-12-21 20:11:30 +01:00
Stefan Parviainen
aa73259a47 Fancy categories input with bootstrap-tagsinput 2014-12-21 12:42:07 +01:00
friendica
6d8214f96b provide link to help for channel permission roles when creating a channel 2014-12-19 01:48:47 -08:00
friendica
f113984d69 essentials for creating a "block-style" list-mode page such as one might have for a pinterest-style layout. Just load view/theme/redbasic/css/blockmode.css after redbasic PCSS - you're done. We may need some other indicator besides the number of comments to indicate "click here to see the rest of the article", but we're a bit short on space so maybe a view icon will work. 2014-12-16 23:40:52 -08:00
friendica
2fcbb9c4b3 fix some directory anomolies 2014-12-16 18:33:16 -08:00
friendica
07e747ed0e add divmore to directory entries 2014-12-16 17:29:16 -08:00
friendica
7bee4e5997 build a channel based thread viewing link when in list_mode and when using the channel module, which will disable list_mode (this was checked in yesterday) for the benefit of viewing threads with the correct identities and comment permissions instead of relying on the semi-random uid chosen by mod/display when viewed by an authenticated remote_user(). 2014-12-16 14:12:40 -08:00
friendica
2e990743e7 Merge https://github.com/friendica/red into pending_merge 2014-12-15 14:37:57 -08:00
friendica
f28103d595 wall tags 2014-12-15 14:37:31 -08:00
Thomas Willingham
c6d0695edf Issue #743 2014-12-15 19:32:28 +00:00
Thomas Willingham
049f08e6ad Merge pull request #744 from pafcu/searchhelp 
Add hint on how to use search box
 2014-12-15 14:53:25 +00:00
Stefan Parviainen
ce88f0ab6a Add hint on how to use search box 2014-12-14 18:40:59 +01:00
Stefan Parviainen
0f169a1427 Add extra class to verified item icon 2014-12-14 12:25:08 +01:00
Thomas Willingham
76fdfb7ef5 Merge pull request #738 from pafcu/moreids 
Add some ids to nav elements
 2014-12-13 16:40:13 +00:00
Thomas Willingham
5fac8e80de Issue #739 2014-12-13 15:00:00 +00:00
Stefan Parviainen
513efc8928 Add some ids to nav elements 2014-12-12 16:27:45 +01:00
marijus
960c35bad3 move profile css to mod_profile and minoor fixes 2014-12-11 11:44:46 +01:00
marijus
b86c4156fc some work on profile page - mostly whitespace 2014-12-10 22:13:44 +01:00
marijus
cc365513ed adjustment to clear browser location button only if use browser location option is set 2014-12-09 15:22:53 +01:00
marijus
242713ebef show clear browser location button only if use browser location option is set and minor css fixes 2014-12-09 15:09:19 +01:00
Stefan Parviainen
e233e386b8 Group comment editor icons 2014-12-08 22:46:30 +01:00
Stefan Parviainen
d65ad03aec Put some spacing between share types and other buttons in jot 2014-12-08 22:37:02 +01:00
Thomas Willingham
934172c2fc Merge pull request #724 from pafcu/suggestionsindir 
Show suggestions in directory
 2014-12-08 13:34:56 +00:00