aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Resolving merge conflictHaakon Meland Eriksen2015-11-292-55/+0
|
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-287-6/+62
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/datetime.php include/text.php mod/events.php version.inc view/css/mod_events.css view/theme/redbasic/css/style.css view/tpl/event_head.tpl view/tpl/events-js.tpl view/tpl/jot.tpl
| * move events tools to aside widgetMario Vavti2015-11-271-1/+15
| |
| * fixes #194 - New directory server is selected on every directory page reloadMario Vavti2015-11-271-1/+1
| |
| * don't show item_delayed_publish items in tag cloudsredmatrix2015-11-262-4/+3
| |
| * various css fixesMario Vavti2015-11-261-0/+1
| |
| * beautify event item codeMario Vavti2015-11-261-45/+32
| |
| * default timepicker to 15 min steps. abbr -> spanMario Vavti2015-11-261-1/+1
| |
| * we also need nofinish in the object. css ficesMario Vavti2015-11-261-0/+2
| |
| * also catch the other objectMario Vavti2015-11-261-0/+5
| |
| * first iteration on the event itemMario Vavti2015-11-264-1/+57
| |
| * some basic event stylingMario Vavti2015-11-251-10/+12
| |
| * add (blank?) label param to other instances of datetimeselredmatrix2015-11-241-2/+2
| |
| * oups :)Mario Vavti2015-11-241-1/+1
| |
| * some event heavy lifting - please test and report issuesMario Vavti2015-11-241-11/+12
| |
* | Removed my version of jot.tplHaakon Meland Eriksen2015-11-285-24/+90
|/
* issue #184redmatrix2015-11-231-1/+1
|
* delivery report tweaksredmatrix2015-11-222-1/+26
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-223-7/+26
|\ | | | | | | | | Conflicts: version.inc
| * do not hide scrollbarsMario Vavti2015-11-211-1/+1
| |
| * datetimepicker should also respect first day of week settingMario Vavti2015-11-211-2/+2
| |
| * Use http_status() instead of homegrowing it. Adapt http_status to handle ↵ken restivo2015-11-202-5/+24
| | | | | | | | replies with data.
* | webpages and design elements weren't being included in the item export query.redmatrix2015-11-221-1/+2
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-201-0/+1
|\
| * Report correct HTTP error code, i.e. for API callers.ken restivo2015-11-201-0/+1
| |
* | add v4 project roadmap, partial fix for cloning of profile photos on ↵redmatrix2015-11-201-0/+11
|/ | | | alternate profiles
* change _newwin to _blank because the window named _newwin may be hard to ↵redmatrix2015-11-202-18/+18
| | | | find if you have lots of windows/tabs open.
* issue #85, community tags and file tags lost during edits. This required ↵redmatrix2015-11-205-18/+31
| | | | splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits.
* change action label from 'stop following' to 'unfollow thread'redmatrix2015-11-191-1/+1
|
* new feature: 'suppress_duplicates' issue #146 triggered with less than two ↵redmatrix2015-11-191-0/+1
| | | | minutes between posts having identical content.
* move today button from aside to section titleMario Vavti2015-11-191-1/+0
|
* rename some menusMario Vavti2015-11-191-3/+3
|
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-182-4/+5
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-181-4/+4
| |\
| | * Pass in account_id. Required for bulk identity importer.ken restivo2015-11-181-4/+4
| | |
| * | wsod viewing photo widgetredmatrix2015-11-181-0/+1
| |/
* / some events refacturingMario Vavti2015-11-181-0/+15
|/
* fix admin plugin hooksredmatrix2015-11-171-0/+17
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-171-1/+1
|\
| * whitespaceMario Vavti2015-11-171-1/+1
| |
| * more css fixesMario Vavti2015-11-171-1/+1
| |
| * missing closing " for src attributeMario Vavti2015-11-171-1/+1
| |
* | photo album widget permissions issueredmatrix2015-11-172-0/+6
|/
* fix api/direct_messages/new at least for the json case. We seem to have a ↵redmatrix2015-11-161-2/+2
| | | | missing template for XML
* tag_deliver of an edit to an already uplinked item wasn't resetting ↵redmatrix2015-11-151-1/+4
| | | | permissions and ownership bits before starting delivery chain on the edit.
* allow plugins to also log to a different named logfile and also alter the ↵redmatrix2015-11-151-1/+1
| | | | log message
* permission issues editing wall-to-wall postsredmatrix2015-11-151-2/+9
|
* issue with dead hub detectionredmatrix2015-11-151-1/+1
|
* revert html in markdown for posts, but trim the input before processing the ↵redmatrix2015-11-151-1/+1
| | | | markdown
* issues connecting to local forumredmatrix2015-11-152-12/+8
|