aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improvements in duplicate like detection, especially w/r/t event participationfriendica2015-02-102-8/+29
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-101-1/+1
|\
| * Merge pull request #893 from zzottel/masterRedMatrix2015-02-101-1/+1
| |\ | | | | | | make update 1133 work in PHP < 5.5
| | * make update 1133 work in PHP < 5.5zottel2015-02-101-1/+1
| |/
* | more attendancefriendica2015-02-103-81/+77
| |
* | correct the object type if it isn't stored/linked to an item yetfriendica2015-02-101-1/+1
| |
* | cleanup event attendance - make sure it works in list mode.friendica2015-02-103-65/+48
| |
* | more progress on event confirmationsfriendica2015-02-105-14/+76
| |
* | like formatting for extended consensus itemsfriendica2015-02-094-61/+108
|/
* apply max_import_size to Diaspora postsfriendica2015-02-091-0/+43
|
* bring some styling back to the colorbox and improve the event preview abilityfriendica2015-02-0912-17/+70
|
* make preview button largerfriendica2015-02-091-1/+1
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-093-7/+25
|\
| * Merge pull request #892 from redswede/masterRedMatrix2015-02-102-1/+24
| |\ | | | | | | comparison between activity stream networks
| | * Changed a heading roles.md. Added the comparison. No idea how it renders ↵RedSwede2015-02-072-1/+24
| | | | | | | | | | | | with markdownify.
| * | improve sql querymarijus2015-02-091-6/+1
| | |
* | | event form - provide map ability for location field and add preview abilityfriendica2015-02-094-8/+31
| | |
* | | title missing sending to diaspora (which doesn't support titles but let's ↵friendica2015-02-092-20/+3
|/ / | | | | | | not go there).
* | fix for service_plink() after observing it in the wildfriendica2015-02-092-2/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-081-5/+0
|\ \
| * | fix transparent background in collapsed nav with project home enabledmarijus2015-02-091-5/+0
| | |
* | | help text for the "adjust for viewer timezone" toggle switch since you ↵friendica2015-02-081-1/+1
|/ / | | | | | | apparently need an IQ of 230 or greater to be able to use it correctly.
* | generate the Swedish strings file from the last sv/messages.po updatefriendica2015-02-081-927/+959
| |
* | Merge pull request #890 from f03el/masterRedMatrix2015-02-091-4128/+4271
|\ \ | | | | | | Update Swedish strings
| * | Update Swedish stringsErik Lundin2015-02-071-4128/+4271
| |/
* | Merge branch 'event_edit'friendica2015-02-085-15/+120
|\ \
| * | we still need an event preview but this looks a lot better.friendica2015-02-085-60/+100
| | |
| * | first cut at putting editor tools in event formfriendica2015-02-081-0/+65
| | |
* | | undo extra loggingfriendica2015-02-081-0/+1
|/ /
* | generate the correct service permalinkfriendica2015-02-083-8/+30
| |
* | make default calendar view ambivalent to the state of the ignore flag.friendica2015-02-081-3/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-081-1/+1
|\|
| * revert to get_rel_link()marijus2015-02-061-1/+1
| |
* | restrict "mark all events seen" to only the events that are presented in the ↵friendica2015-02-082-3/+5
|/ | | | notification view.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-061-1/+1
|\
| * fix objurl until get_rel_link() gets sortedmarijus2015-02-061-1/+1
| |
* | more doc updatesfriendica2015-02-0610-0/+772
| |
* | get_rel_link broken - also weekly doc updatesfriendica2015-02-0675-2213/+2504
|/
* style the checkboxes in the event formfriendica2015-02-053-5/+9
|
* event form cleanup backported from trinidad - still need to style the checkboxesfriendica2015-02-054-9/+37
|
* allow post expiration to be set from a config (and therefore a plugin/addon)friendica2015-02-051-1/+4
|
* over-ride permissions for sys channel delivery from diasporafriendica2015-02-051-9/+13
|
* another issue with diaspora postings to sys channel - sys has no ↵friendica2015-02-051-6/+14
| | | | connections, hence no abook records.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-053-27/+70
|\
| * typomarijus2015-02-051-1/+1
| |
| * forgot to remove some debug stuffmarijus2015-02-051-2/+0
| |
| * make file activity respect parent dir permissions workmarijus2015-02-051-22/+66
| |
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-0549-5349/+6405
| |\
| * | escape datesHabeas Codice2015-02-051-1/+1
| | |
| * | typo/cleanup pg onlyHabeas Codice2015-02-051-4/+5
| | |