redmatrix
|
c75f76f740
|
heavy lifting on admin security page
|
2016-02-03 20:24:46 -08:00 |
|
redmatrix
|
28386d7471
|
admin security page for configuring white and black lists and other security options.
|
2016-02-03 15:23:24 -08:00 |
|
redmatrix
|
06dcaaa821
|
some zcard cleanup - still eneds a lot more work
|
2016-02-02 17:14:07 -08:00 |
|
redmatrix
|
5f5342c0d3
|
adjust for folks that still have 175px profile photos
|
2016-02-01 21:21:22 -08:00 |
|
redmatrix
|
15e003f030
|
missing template
|
2016-02-01 21:14:36 -08:00 |
|
redmatrix
|
723a49ccee
|
add photos to the profile "likes this" dropdowns
|
2016-02-01 17:42:53 -08:00 |
|
Mario Vavti
|
722d7ff38d
|
lower caution level from danger to warning for ignore button
|
2016-01-27 09:46:18 +01:00 |
|
redmatrix
|
5d6657f77a
|
provide an icon to make 'add privacy group' stand out from the list of groups. Please revert if you think it's too messy.
|
2016-01-27 00:11:15 -08:00 |
|
redmatrix
|
9b08051703
|
bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops.
|
2016-01-26 16:57:36 -08:00 |
|
jeroenpraat
|
68030d12cf
|
Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.
|
2016-01-27 00:24:05 +01:00 |
|
redmatrix
|
9081ddb455
|
don't provide notification icons on manage page for delegated channels
|
2016-01-24 18:36:38 -08:00 |
|
redmatrix
|
2be515e7bb
|
set the actual value of the password input field to a single space on remove channel and remove account because firefox does not honour 'autocomplete="off"' and insists on filling in the password, which completely defeats the purpose of password protecting this function. We want to ensure it can only be executed by somebody who knows the password and not somebody who happens upon an unattended browser session. This space is annoying and must be removed to enter the password correctly but this appears to be the only way to provide the necessary safety for that page. Setting autocomplete to a random string as suggested by the firefox doco doesn't appear to do anything useful, as autocomplete is still performed.
|
2016-01-21 14:32:41 -08:00 |
|
Mario Vavti
|
b711c050db
|
make contact block look widget alike
|
2016-01-21 11:48:10 +01:00 |
|
Mario Vavti
|
928f1bfa7b
|
css cleanup
|
2016-01-21 10:58:38 +01:00 |
|
Mario Vavti
|
97ebf9021c
|
bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image
|
2016-01-21 10:42:20 +01:00 |
|
redmatrix
|
be83855acf
|
generalise the site icon
|
2016-01-17 16:50:37 -08:00 |
|
Mario Vavti
|
0d5daea93d
|
move dir total ratings button to the left to prevent the connect button beeing shifted on channels with ratings
|
2016-01-16 21:30:57 +01:00 |
|
Mario Vavti
|
2498df68c7
|
change button order for consistency
|
2016-01-15 13:20:45 +01:00 |
|
Mario Vavti
|
d36aa4fc89
|
provide a recent activity link in /connections
|
2016-01-15 12:08:04 +01:00 |
|
Mario Vavti
|
f4e1b2123a
|
add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better...
|
2016-01-15 11:28:05 +01:00 |
|
Mario Vavti
|
63ee0daac5
|
provide more contact infos and update some protocol type definitions
|
2016-01-15 10:42:44 +01:00 |
|
Mario Vavti
|
614dcb8bce
|
since the perms will be reset on approval better do not provide the perms tool before we approved a connection
|
2016-01-14 23:38:00 +01:00 |
|
Mario Vavti
|
588d022fbb
|
provide some info about our contacts - status (archived, hidden, etc.), public forum (like in directory) and show since when we are connected
|
2016-01-14 23:23:12 +01:00 |
|
Mario Vavti
|
e2b79c34bc
|
some work on connections
|
2016-01-14 13:50:47 +01:00 |
|
Mario Vavti
|
69573c6afe
|
some template work on follow widget
|
2016-01-14 10:36:45 +01:00 |
|
redmatrix
|
e500a08f15
|
more progress on cover photo cropping and storage
|
2016-01-13 20:26:27 -08:00 |
|
redmatrix
|
9584ca080c
|
some initial work on uploading and cropping cover photos
|
2016-01-13 17:32:09 -08:00 |
|
redmatrix
|
3bf9dc9f18
|
more work on auto channel creation during register
|
2016-01-13 01:17:02 -08:00 |
|
redmatrix
|
66c8658898
|
plugin version compatibility checking. To use, set MinVersion, MaxVersion or MinPHPversion in the plugin header block. Case is not important. We check the project versions against STD_VERSION, which should be rolled to a new y of x.x.y if the plugin interface or project code changes in an incompatible way.
|
2016-01-11 16:34:12 -08:00 |
|
jeroenpraat
|
e51035ba9a
|
String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html
|
2016-01-10 20:45:39 +01:00 |
|
redmatrix
|
93565ea768
|
features management page for hubmins
|
2016-01-06 13:01:28 -08:00 |
|
jeroenpraat
|
9e6f43e3ff
|
added some real examples for the default-permission-role in de docu. also updated comanche template redable and another css class to tpl file
|
2016-01-03 21:56:39 +01:00 |
|
redmatrix
|
5b0a17359d
|
Provide the ability for a hub admin to specify a default permissions role for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired.
|
2016-01-02 23:39:57 -08:00 |
|
jeroenpraat
|
1ad90b8662
|
Update es+nl strings and added title on hover for items (needed to view titles that are cut-off)
|
2016-01-02 15:14:30 +01:00 |
|
redmatrix
|
c38edfcb32
|
issue #241 (redmatrix issue 405)
|
2016-01-01 16:12:43 -08:00 |
|
Andrew Manning
|
3d6359f2e7
|
Removed defunct URL from old auto-update idea
|
2015-12-26 16:20:56 -05:00 |
|
redmatrix
|
a085f4df7f
|
regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting.
|
2015-12-25 14:25:58 -08:00 |
|
redmatrix
|
36717e5f32
|
start on refactor of plugin/theme/widget info block parsing
|
2015-12-22 19:53:00 -08:00 |
|
redmatrix
|
f23e8f8d41
|
merge hell
|
2015-12-20 14:55:43 -08:00 |
|
Haakon Meland Eriksen
|
628e565a6c
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-18 16:04:07 +01:00 |
|
Mario Vavti
|
f78e9001f3
|
fix search item attachment rendering
|
2015-12-17 19:39:26 +01:00 |
|
jeroenpraat
|
5a59cd9b8c
|
Invitation only added to the admin site page. Plus css wrapper class to docu search.
|
2015-12-15 21:00:40 +01:00 |
|
Haakon Meland Eriksen
|
3b1ab5e79c
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-14 18:55:43 +01:00 |
|
Haakon Meland Eriksen
|
565126a888
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-12 10:00:15 +01:00 |
|
Haakon Meland Eriksen
|
e7d9863432
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-11 19:40:09 +01:00 |
|
Haakon Meland Eriksen
|
b9af0645c2
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-11 19:34:29 +01:00 |
|
Haakon Meland Eriksen
|
d86bc0b6cf
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-10 20:43:32 +01:00 |
|
Haakon Meland Eriksen
|
e01d4f289b
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-10 07:27:42 +01:00 |
|
Haakon Meland Eriksen
|
6a3995014e
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-09 07:38:58 +01:00 |
|
Haakon Meland Eriksen
|
534a537319
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-09 07:31:18 +01:00 |
|
Haakon Meland Eriksen
|
10eefc4eed
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version
|
2015-12-09 07:28:55 +01:00 |
|
Haakon Meland Eriksen
|
3d4b3b6a92
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl
|
2015-12-09 07:19:31 +01:00 |
|
redmatrix
|
29ac533cc9
|
remove some unused stuff
|
2015-12-08 16:32:06 -08:00 |
|
redmatrix
|
b9f5076cfc
|
move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time)
|
2015-12-07 19:17:40 -08:00 |
|
Mario Vavti
|
69c9f4588c
|
make justify gallery work with more than one albums per page (eg album widget)
|
2015-12-07 12:13:51 +01:00 |
|
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 |
|