marijus
|
b86ed864aa
|
to get the correct total count we should probably only count the arrays with count key set
|
2015-02-11 12:09:04 +01:00 |
|
marijus
|
4d7b65c234
|
Merge branch 'master' of https://github.com/friendica/red
|
2015-02-11 10:55:48 +01:00 |
|
marijus
|
499841a722
|
typo agree->disagree
|
2015-02-11 10:54:43 +01:00 |
|
friendica
|
3f76cbf40b
|
cut/paste typo
|
2015-02-11 01:53:17 -08:00 |
|
friendica
|
e8bdf2b8d7
|
more permissions tweaking
|
2015-02-10 21:21:18 -08:00 |
|
friendica
|
583af02f71
|
fix permissions
|
2015-02-10 20:43:04 -08:00 |
|
friendica
|
149a588b11
|
ensure we have permission before displaying buttons
|
2015-02-10 20:21:54 -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
|
79da33dafd
|
improvements in duplicate like detection, especially w/r/t event participation
|
2015-02-10 17:49:46 -08:00 |
|
friendica
|
9a773b45e4
|
Merge https://github.com/friendica/red into pending_merge
|
2015-02-10 14:50:19 -08:00 |
|
friendica
|
4632d30a78
|
more attendance
|
2015-02-10 14:47:09 -08:00 |
|
RedMatrix
|
14d3aa02ff
|
Merge pull request #893 from zzottel/master
make update 1133 work in PHP < 5.5
|
2015-02-10 20:49:33 +11:00 |
|
friendica
|
268691ffb4
|
correct the object type if it isn't stored/linked to an item yet
|
2015-02-10 01:05:49 -08:00 |
|
zottel
|
9dda248b94
|
make update 1133 work in PHP < 5.5
|
2015-02-10 09:49:26 +01: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
|
55c3c54ef6
|
apply max_import_size to Diaspora posts
|
2015-02-09 19:54:48 -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
|
0f494a5a2a
|
Merge https://github.com/friendica/red into pending_merge
|
2015-02-09 16:00:03 -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
|
0e74ebc6a9
|
title missing sending to diaspora (which doesn't support titles but let's not go there).
|
2015-02-09 15:12:15 -08:00 |
|
RedMatrix
|
e9125ed922
|
Merge pull request #892 from redswede/master
comparison between activity stream networks
|
2015-02-10 08:36:42 +11:00 |
|
marijus
|
e2aa0a273c
|
improve sql query
|
2015-02-09 21:46:22 +01:00 |
|
friendica
|
d473c3c500
|
fix for service_plink() after observing it in the wild
|
2015-02-09 00:43:38 -08:00 |
|
friendica
|
92afed0f5c
|
Merge https://github.com/friendica/red into pending_merge
|
2015-02-08 23:41:58 -08:00 |
|
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 |
|
marijus
|
b31a2f109f
|
fix transparent background in collapsed nav with project home enabled
|
2015-02-09 08:35:53 +01:00 |
|
friendica
|
ad25baf035
|
generate the Swedish strings file from the last sv/messages.po update
|
2015-02-08 22:42:38 -08:00 |
|
RedMatrix
|
247579ebf1
|
Merge pull request #890 from f03el/master
Update Swedish strings
|
2015-02-09 15:52:07 +11:00 |
|
friendica
|
deab5d0dc4
|
Merge branch 'event_edit'
|
2015-02-08 20:23:36 -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
|
b8add899a2
|
undo extra logging
|
2015-02-08 19:28:18 -08:00 |
|
friendica
|
a1d84f96b6
|
first cut at putting editor tools in event form
|
2015-02-08 19:25:35 -08:00 |
|
friendica
|
64191de5e7
|
generate the correct service permalink
|
2015-02-08 18:31:51 -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 |
|
RedSwede
|
fe54e6d3a4
|
Changed a heading roles.md. Added the comparison. No idea how it renders with markdownify.
|
2015-02-07 16:49:52 +01:00 |
|
Erik Lundin
|
352dfb8d7b
|
Update Swedish strings
|
2015-02-07 13:48:19 +01:00 |
|
marijus
|
712bc643b5
|
revert to get_rel_link()
|
2015-02-06 11:34:23 +01:00 |
|
friendica
|
89739c0ff7
|
Merge https://github.com/friendica/red into pending_merge
|
2015-02-06 02:08:12 -08:00 |
|
friendica
|
8840980797
|
more doc updates
|
2015-02-06 02:07:52 -08:00 |
|
friendica
|
7edab47658
|
get_rel_link broken - also weekly doc updates
|
2015-02-06 02:07:10 -08: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
|
abcc70722c
|
event form cleanup backported from trinidad - still need to style the checkboxes
|
2015-02-05 19:37:55 -08:00 |
|
friendica
|
b948fbaeda
|
allow post expiration to be set from a config (and therefore a plugin/addon)
|
2015-02-05 19:09:42 -08:00 |
|