friendica
|
b31fe5c55d
|
help text for the "adjust for viewer timezone" toggle switch since you apparently need an IQ of 230 or greater to be able to use it correctly.
|
2015-02-08 23:37:34 -08:00 |
|
friendica
|
08b757a22c
|
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
|
2015-02-08 20:57:37 -08:00 |
|
friendica
|
b8add899a2
|
undo extra logging
|
2015-02-08 19:28:18 -08:00 |
|
friendica
|
7893b64955
|
make default calendar view ambivalent to the state of the ignore flag.
|
2015-02-08 15:14:45 -08:00 |
|
friendica
|
11dfeb652b
|
Merge https://github.com/friendica/red into pending_merge
|
2015-02-08 13:53:46 -08:00 |
|
friendica
|
9b1c09fe83
|
restrict "mark all events seen" to only the events that are presented in the notification view.
|
2015-02-08 13:52:46 -08:00 |
|
marijus
|
712bc643b5
|
revert to get_rel_link()
|
2015-02-06 11:34:23 +01:00 |
|
marijus
|
ed050e8ede
|
fix objurl until get_rel_link() gets sorted
|
2015-02-06 10:40:55 +01:00 |
|
friendica
|
e7a68eaef0
|
style the checkboxes in the event form
|
2015-02-05 21:01:02 -08:00 |
|
friendica
|
4b348d2489
|
Merge branch 'master' into tres
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
|
2015-02-05 19:38:43 -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
|
561bab4ece
|
remote rating and addition of rate-me to channel profile sidebar
|
2015-02-04 17:32:29 -08:00 |
|
friendica
|
1ceb0a7fba
|
hide channel address in directory from hovertip if not logged into the matrix
|
2015-02-03 23:36:37 -08:00 |
|
friendica
|
0357180164
|
remove extra debugging
|
2015-02-03 23:33:06 -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
|
0cc29af6d0
|
order ratings friends first
|
2015-02-03 22:55:01 -08:00 |
|
friendica
|
4ead2cd79d
|
final cleanup on ratings feature
|
2015-02-03 21:19:29 -08:00 |
|
friendica
|
86771547e6
|
finish off the sync functions
|
2015-02-03 18:35:54 -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
|
36b756e4cd
|
honour block public setting - especially for standalones
|
2015-02-03 15:16:03 -08:00 |
|
friendica
|
df632c4232
|
run ratingsearch on the server
|
2015-02-03 15:06:16 -08:00 |
|
friendica
|
4362aa4c26
|
for now punt if have no poi, but we should get it from the server
|
2015-02-03 11:18:00 -08:00 |
|
friendica
|
6067274b51
|
start to tie ratings to the directory page
|
2015-02-02 23:58:44 -08:00 |
|
friendica
|
77379029f5
|
add ratings to the directory sync arrays
|
2015-02-02 21:07:46 -08:00 |
|
friendica
|
1807db6cb0
|
send rating information to directories
|
2015-02-02 20:13:07 -08:00 |
|
friendica
|
fa710106e5
|
sign the ratings, fix the bugs
|
2015-02-02 17:58:51 -08:00 |
|
friendica
|
03bb236651
|
Merge branch 'master' into pocorate
|
2015-02-02 17:33:55 -08:00 |
|
friendica
|
fb6deb113b
|
improved directory registration - honour standalones and do the right thing
|
2015-02-02 17:32:54 -08:00 |
|
friendica
|
125ebfeb0c
|
add signatures
|
2015-02-02 16:54:55 -08:00 |
|
friendica
|
aafed50a0e
|
Merge branch 'master' into tres
|
2015-02-01 20:30:47 -08:00 |
|
friendica
|
e58bef049d
|
admin/dbsync not reporting failed updates
|
2015-02-01 15:41:01 -08:00 |
|
friendica
|
b1a92d620e
|
two tracks proceeding in parallel - first adding the ability to store a digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory.
|
2015-02-01 15:10:52 -08:00 |
|
friendica
|
e6a5f78003
|
Merge branch 'master' into tres
Conflicts:
include/zot.php
|
2015-01-31 00:50:20 -08: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
|
4a243b63f7
|
cleanup event form and various required indicators on inputs
|
2015-01-29 20:09:48 -08:00 |
|
friendica
|
3e22de0be0
|
how did that stuff merge? grrrr....
|
2015-01-29 18:17:24 -08:00 |
|
friendica
|
43f5fbddc6
|
enable ratings only in this branch until we're ready to push
|
2015-01-29 15:21:50 -08:00 |
|
friendica
|
df6d54c64e
|
Merge branch 'master' into pocorate
|
2015-01-29 15:21:19 -08:00 |
|
friendica
|
d7dae3c72a
|
Merge https://github.com/friendica/red into pending_merge
|
2015-01-29 15:19:16 -08:00 |
|
friendica
|
e2edc2c968
|
disable ratings until we're a bit further along. It's all changing.
|
2015-01-29 15:17:50 -08:00 |
|
friendica
|
912be23e16
|
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
|
2015-01-29 15:09:35 -08:00 |
|
friendica
|
ff68ea6087
|
more message restrict conversions
|
2015-01-29 14:51:41 -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
|
bee939d79a
|
fix issue 848 + code comments
|
2015-01-29 16:06:39 +01:00 |
|
friendica
|
fd0b6c967f
|
Merge branch 'master' into pocorate
|
2015-01-29 00:28:23 -08:00 |
|
friendica
|
c993ddd86e
|
prate module
|
2015-01-29 00:28:02 -08:00 |
|
friendica
|
b9a760783d
|
Merge https://github.com/friendica/red into pending_merge
|
2015-01-28 21:11:07 -08:00 |
|
friendica
|
e157371c39
|
remote_user => remote_channel
|
2015-01-28 20:58:59 -08:00 |
|