harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,187 Commits 6 Branches 36 Tags
a4caaefd32ca68f45f7526dde61d17e8ca3dc3af
Commit Graph

14187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00
redmatrix 4e3d295c90 import and export tasks (calendar todo items) 2015-08-18 19:06:50 -07:00
redmatrix 3b1554db2e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-18 17:15:53 -07:00
redmatrix 37d07a7d2a add event_sequence for vtodo's 2015-08-18 17:10:40 -07:00
redmatrix 75fbf21e6b add month to export filename when using month 2015-08-17 22:27:41 -07:00
redmatrix 27b61b1456 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-17 22:25:47 -07:00
redmatrix 9f4f967ead off by one 2015-08-17 22:25:17 -07:00
redmatrix 9763c46b7e Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-08-17 22:23:23 -07:00
redmatrix f682325924 provide ability to export by month as well as by year 2015-08-17 22:20:10 -07:00
redmatrix abe362bdd4 issues encountered whilst testing import_items module using yearly dump files 2015-08-17 21:56:55 -07:00
redmatrix ea331b043c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-17 21:41:14 -07:00
redmatrix 1a4a921528 provide module for importing yearly content dumps 2015-08-17 21:40:40 -07:00
redmatrix 1982fc807f add item_id to yearly dump files 2015-08-17 21:38:43 -07:00
redmatrix 30fd17c58d Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	view/nl/messages.po
 2015-08-17 16:14:15 -07:00
redmatrix 4ebee195cc Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-17 16:12:35 -07:00
redmatrix 98eeff7538 commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css 2015-08-17 16:11:10 -07:00
jeroenpraat f2fdc91ad5 Replaced Dutch po file by Spanish po file by accident. Had no visible impact. 2015-08-17 22:27:33 +02:00
jeroenpraat d88c25c982 Final Spanish strings for now 2015-08-17 22:21:55 +02:00
jeroenpraat f70fd95361 Fixed Spanish strings 2015-08-17 13:38:43 +02:00
redmatrix be3a272a80 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-16 19:54:38 -07:00
redmatrix 631eb4b2c2 issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation. 2015-08-16 19:52:25 -07:00
redmatrix 6a1d1867f0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-16 19:13:29 -07:00
redmatrix b3b566c907 add DB support for tasks, todo items and repeating events 2015-08-16 17:17:34 -07:00
redmatrix 18bc12c21c Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
	util/messages.po
 2015-08-14 22:24:15 -07:00
redmatrix 1d4dc7e27c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-14 22:20:44 -07:00
redmatrix 0d84c77c6c set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost. 2015-08-14 22:19:15 -07:00
redmatrix 400eb748eb Merge pull request #385 from solstag/commentperm 
Actually work out comment perms in zot.php (badly attempted at 36b5f6ac)
 2015-08-15 10:08:26 +10:00
Alexandre Hannud Abdo 73b30de9cb Properly fix which perms get checked for comments, Mike's solution 2015-08-14 12:21:05 -03:00
jeroenpraat 7a8d0a03f6 update spanish 2015-08-14 15:57:05 +02:00
redmatrix d140620008 add item validation function 2015-08-13 19:35:57 -07:00
redmatrix 50a1e0c618 attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view. 2015-08-13 17:11:59 -07:00
redmatrix ef73880459 reverting 36b5f6ac 2015-08-12 22:48:08 -07:00
redmatrix 98f3242e73 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-12 22:38:08 -07:00
redmatrix 0b7365e2db revert 36b5f6ac 2015-08-12 22:37:24 -07:00
redmatrix f88dc84091 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	view/es/htconfig.tpl
	view/es/update_fail_eml.tpl
 2015-08-12 20:36:32 -07:00
jeroenpraat 3099562a21 Some corrections of Spanish strings. 2015-08-12 20:52:46 +02:00
jeroenpraat 588d22974c And Catalan! 2015-08-12 15:16:56 +02:00
jeroenpraat 4c2bbe3c41 Thanks to Manuel. Updated Spanish to 100 procent. 2015-08-12 15:11:04 +02:00
redmatrix b634c08d0e resolve conflict 2015-08-11 22:41:27 -07:00
redmatrix 2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	doc/history.md
	mod/import.php
 2015-08-11 22:35:36 -07:00
redmatrix d882b3274b doc fixes 2015-08-11 22:32:53 -07:00
redmatrix 1aa48ddfaa Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-11 22:32:33 -07:00
redmatrix ad02d5589d Merge pull request #383 from solstag/commentpermgood 
Require comment perms only for own posts, allow senders to deliver co…
 2015-08-12 15:31:36 +10:00
redmatrix 0e8991fec2 more consistent output on forum widget 2015-08-11 22:23:20 -07:00
redmatrix b651604e8b remove the forum limit 2015-08-11 20:58:03 -07:00
redmatrix 1932e72603 arghh 2015-08-11 20:25:52 -07:00
redmatrix be4eb4eeb8 typo 2015-08-11 20:25:02 -07:00
redmatrix 89fa36ce2a wrong cid 2015-08-11 20:24:06 -07:00
redmatrix 80df97e734 don't show '0' results, like notifications 2015-08-11 20:18:34 -07:00
redmatrix 8dd7fab38d order by name 2015-08-11 20:16:17 -07:00