Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | more db column renames | redmatrix | 2016-05-31 | 1 | -2/+2 | |
| | ||||||
* | some event fixes, also change jquery-textcomplete to un-minified since the ↵ | redmatrix | 2016-05-25 | 1 | -21/+38 | |
| | | | | minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it. | |||||
* | rework the conversation object stuff at a high level - still needs a bit of ↵ | redmatrix | 2016-05-20 | 1 | -1/+1 | |
| | | | | refactoring | |||||
* | sabre upgrade | redmatrix | 2016-05-10 | 1 | -11/+1 | |
| | ||||||
* | initial sabre upgrade (needs lots of work - to wit: authentication, redo the ↵ | redmatrix | 2016-05-10 | 1 | -10/+10 | |
| | | | | browser interface, and rework event export/import) | |||||
* | update icon names in include/ | Treer | 2016-05-01 | 1 | -1/+1 | |
| | ||||||
* | static App | redmatrix | 2016-03-31 | 1 | -2/+2 | |
| | ||||||
* | when creating an event from a post in our stream, if the original post was ↵ | redmatrix | 2016-02-25 | 1 | -0/+11 | |
| | | | | private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions. | |||||
* | Provide Zotlabs\Project and System class for querying details about the ↵ | redmatrix | 2016-02-18 | 1 | -1/+1 | |
| | | | | project/version info. Move these out of /boot.php | |||||
* | various issues from the forums | redmatrix | 2016-01-17 | 1 | -1/+1 | |
| | ||||||
* | we also need nofinish in the object. css fices | Mario Vavti | 2015-11-26 | 1 | -0/+2 | |
| | ||||||
* | also catch the other object | Mario Vavti | 2015-11-26 | 1 | -0/+5 | |
| | ||||||
* | first iteration on the event item | Mario Vavti | 2015-11-26 | 1 | -0/+5 | |
| | ||||||
* | some basic event styling | Mario Vavti | 2015-11-25 | 1 | -10/+12 | |
| | ||||||
* | Document the additional content export options | redmatrix | 2015-09-24 | 1 | -1/+4 | |
| | ||||||
* | timezone tweaks | redmatrix | 2015-09-23 | 1 | -6/+10 | |
| | ||||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -1/+15 | |
|\ | ||||||
| * | create event sync packets | redmatrix | 2015-09-07 | 1 | -0/+14 | |
| | | ||||||
* | | edited event showing bad signature and null_date for edit timestamp | redmatrix | 2015-08-24 | 1 | -1/+7 | |
| | | ||||||
* | | support ical priority | redmatrix | 2015-08-20 | 1 | -7/+19 | |
| | | ||||||
* | | cleanup of task widget - make jquery workflow a bit smoother | redmatrix | 2015-08-20 | 1 | -2/+2 | |
| | | ||||||
* | | more work on tasks | redmatrix | 2015-08-20 | 1 | -0/+24 | |
| | | ||||||
* | | do ical export before checking logged in channel | redmatrix | 2015-08-20 | 1 | -1/+1 | |
| | | ||||||
* | | add carriage return to newlines for exported events (rfc2445:4.1) | redmatrix | 2015-08-20 | 1 | -31/+31 | |
| | | ||||||
* | | event integration improvements | redmatrix | 2015-08-19 | 1 | -0/+11 | |
| | | ||||||
* | | import and export tasks (calendar todo items) | redmatrix | 2015-08-18 | 1 | -5/+203 | |
| | | ||||||
* | | provide module for importing yearly content dumps | redmatrix | 2015-08-17 | 1 | -0/+11 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-31 | 1 | -2/+14 | |
|\| | | | | | | | | | Conflicts: util/messages.po | |||||
| * | event parse cleanup | redmatrix | 2015-07-30 | 1 | -2/+8 | |
| | | ||||||
| * | escape $ in events | redmatrix | 2015-07-30 | 1 | -2/+8 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -32/+80 | |
|\| | | | | | | | | | | | several dav fixes Conflicts: include/items.php | |||||
| * | minor cleanup | redmatrix | 2015-07-29 | 1 | -14/+1 | |
| | | ||||||
| * | Merge branch 'vobject' | redmatrix | 2015-07-29 | 1 | -23/+83 | |
| |\ | | | | | | | | | | | | | Conflicts: include/event.php | |||||
| | * | convert ics import to sabre/vobject | redmatrix | 2015-07-29 | 1 | -29/+42 | |
| | | | ||||||
| | * | initial work on using sabre as a vcalendar parser | redmatrix | 2015-07-28 | 1 | -1/+50 | |
| | | | ||||||
| * | | PRIVACY: imported events | redmatrix | 2015-07-29 | 1 | -0/+1 | |
| |/ | ||||||
| * | make superblock block a channel if it's an owner as well as the current ↵ | redmatrix | 2015-07-28 | 1 | -1/+1 | |
| | | | | | | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -1/+85 | |
|\| | | | | | | | | | Conflicts: util/messages.po | |||||
| * | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 1 | -6/+25 | |
| | | ||||||
| * | backend code for importing events from "simple" ics calendar files. | redmatrix | 2015-07-26 | 1 | -0/+65 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 1 | -1/+1 | |
|\| | | | | | | | | | Conflicts: doc/to_do_code.bb | |||||
| * | ics calendar export - commas need to be escaped | redmatrix | 2015-07-21 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | |||||
| | * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | |||||
| * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -58/+66 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | |||||
| * | force event obj_type on update | friendica | 2015-04-20 | 1 | -1/+2 | |
| | | ||||||
| * | Fixed two wrong variable usages in event.php. | Klaus Weidenbach | 2015-03-29 | 1 | -58/+65 | |
| | | | | | | | | I just checked the code, not the functionality. | |||||
* | | slow progress removing bitfields on item table | friendica | 2015-01-21 | 1 | -26/+28 | |
|/ |