extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-30 11:53:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,569 Commits 32 Branches 356 Tags 197 MiB
84ab6b8cec
Commit Graph

2634 Commits

Author SHA1 Message Date
nathangray
a557ce5ceb Fix deleting a single event of a series deleted correctly, but caused the whole series to disappear from view. 2016-06-21 11:42:44 -06:00
nathangray
fc53782f60 Remove participant restriction on new events to just users or groups, now we add any contacts or resources selected as well 2016-06-21 11:17:06 -06:00
Ralf Becker
eae2b52f79 real Exceptions not always shown, because using SyncAppointment instead of SyncAppointmentException did not render required ExceptionStartTime 
Thanks to Sebastian from Z-Push
 2016-06-20 22:11:35 +02:00
nathangray
4625915f11 Fix missing toolbar tooltip translations 2016-06-20 08:05:27 -06:00
Ralf Becker
6a02f1c19a merge changes from update-zpush-2.3 branch into master 2016-06-17 09:11:26 +02:00
Ralf Becker
c07b3b26e4 remove old (from Andreas z-push fork) and no longer used md5body attribute 2016-06-17 08:42:49 +02:00
nathangray
8cb1bb19b1 Check event filters when updating status or category through edit dialog to remove the event if it no longer matches. 2016-06-16 11:08:31 -06:00
Ralf Becker
e600eede2a fix iOS calendar crashed if event-organizer had no email address 2016-06-16 18:14:28 +02:00
nathangray
b8f8d59793 Show holidays & birthdays as events on mobile 2016-06-13 19:08:56 -06:00
nathangray
0d77d8e62a Better handling for drag & drop of multi-day events between blocking & non-blocking areas 2016-06-08 10:16:17 -06:00
Ralf Becker
ce684b0ee7 revert last commit to fix PHP Fatal error: Declaration of calendar_zpush::ChangeMessage($folderid, $_id, SyncAppointment $message, $contentParameters) must be compatible with activesync_plugin_write::ChangeMessage($folderid, $id, $message, $contentParameters) 2016-06-08 13:01:09 +02:00
Ralf Becker
3f9fd761bb revert last commit to fix PHP Fatal error: Declaration of calendar_zpush::ChangeMessage($folderid, $_id, SyncAppointment $message, $contentParameters) must be compatible with activesync_plugin_write::ChangeMessage($folderid, $id, $message, $contentParameters) 2016-06-08 12:53:05 +02:00
Ralf Becker
277c21ed9e add SyncAppointment object to function signature 2016-06-08 11:57:12 +02:00
Ralf Becker
a5b57b3047 fix a PHP Strict Standards: Declaration of *_groupdav::propfind_callback() should be compatible with & EGroupware\Api\CalDAV\Handler::propfind_callback 2016-06-06 13:53:54 +02:00
nathangray
033ba0159f Fix calendar list view custom date filter always switched to another filter & hid the dates 2016-06-02 09:25:01 -06:00
nathangray
660888c716 Drag and drop move or invite in day view 2016-06-01 13:47:18 -06:00
nathangray
6d10b8d231 Drag and drop to another user's calendar 
- Add exception prompt
- Change to -> Move to
 2016-06-01 09:30:42 -06:00
Ralf Becker
ab4cd83b41 remove no longer used boholiday class, seems to been left over from new holiday loading via iCal 2016-05-30 20:32:53 +02:00
nathangray
362366ed28 Fix addressbook - calendar permission issue blocking viewing contact calendar 2016-05-24 17:13:40 -06:00
nathangray
1756179bb3 Restore export function, turns out it is used by context menu -> export 2016-05-24 16:44:14 -06:00
nathangray
61a9a28c4d Fix css include 2016-05-24 15:08:48 -06:00
nathangray
deedf7a808 Handle changing status via ajax for a user in a group invitation 2016-05-24 14:51:16 -06:00
nathangray
5be77f5ef2 Support customfields at the beginning of content 2016-05-18 15:41:20 -06:00
nathangray
8789d8d944 Fix incorrect client update when changing status on a recurring event exception 2016-05-18 11:30:50 -06:00
nathangray
1a16869651 Add missing conversion to human values 2016-05-16 17:26:15 -06:00
nathangray
f1b4367181 Fix original event stays when a series exception is created 2016-05-16 15:56:08 -06:00
nathangray
2976d910db Some bugfixes for planner view in sitemgr: 
- Add check on sel_options arrayMgr for missing owner names, since sidebox is not there
- Pre-fill sel_options for above, so they can be found
- Fix clicking on an event could alter the calendar state
 2016-05-16 14:32:03 -06:00
nathangray
ffccce1c8a Send holiday cache data for current year on initial load, so it's available for sidebox menu. 2016-05-16 11:21:03 -06:00
nathangray
7e0b2543d0 Fix fatal error, get_account_name() does not exist 2016-05-16 10:13:22 -06:00
Ralf Becker
8a24f3e449 fix not loaded header / CSS, caused by missing echo before $GLOBALS['egw']->framework->(header|footer) 2016-05-14 21:26:36 +02:00
Nathan Gray
c6e6da63ef Allow drag and drop between calendars, asking to invite or transfer 2016-05-11 17:29:58 +00:00
Nathan Gray
d321f78eb1 Directly set default resource selection preference 2016-05-09 20:18:10 +00:00
Ralf Becker
19501960e1 fix wrong case in "AsyncService" to "Asyncservice" 2016-05-09 09:15:48 +00:00
Hadi Nategh
c558d1667d Optimize window size of registered popups in appregistry 2016-05-06 15:12:27 +00:00
Klaus Leithoff
7ab832fe9f set a default in paramslist for shift_alarm parm 3 (timestamp) to avoid php-warning and comply to the function description 2016-05-06 13:54:08 +00:00
Nathan Gray
9859cfa679 Fix fatal error caused by moved Categories 2016-05-05 16:56:25 +00:00
Nathan Gray
0eeb8b56c0 - Export plugins now specify the export record class 
- Projectmanager now has filters
 2016-05-04 19:34:30 +00:00
Ralf Becker
4af0e7cb1c WIP EGroupware without phpgwapi&etemplate 2016-05-04 19:07:54 +00:00
Ralf Becker
8c7c0c1eb2 reading holidays now from Mozilla holiday calendars, or a custom iCal URL 2016-05-04 17:15:18 +00:00
Nathan Gray
4c167a2d80 Revert r55868, hide participants for private events 2016-05-04 15:09:37 +00:00
Nathan Gray
e4aa767911 Fix calendar resource search 2016-05-03 21:03:51 +00:00
Ralf Becker
e5d6f6a909 fix calendar preferences to show start- and end-time of day 2016-05-03 13:24:21 +00:00
Ralf Becker
bc4362c22e remove old phpgwapi datetime class from calendar, as it is no longer in api 2016-05-02 20:22:47 +00:00
Ralf Becker
c15a722f3a do not instanciate eT2 Widget in setup (no need, and gives autoloading conflict), also calling static calendar_bo method static 2016-05-02 20:21:59 +00:00
Nathan Gray
5d14807720 Planner sitemgr module 
- Check ACL and only offer users or resources anonymous user has access (read or free/busy) to
- Stop some errors from missing framework breaking the timegrid
- Fallback to be able to get resource labels in all cases
 2016-05-02 19:22:52 +00:00
Ralf Becker
5db786a7ae fixed (hopefully correct) some undefined variables and other IDE warnings 2016-05-02 15:39:41 +00:00
Nathan Gray
cbb2d73b98 Make some old code that returns HTML unused, then remove it 2016-05-02 15:26:56 +00:00
Ralf Becker
dcc003cedf move calendar to new api 2016-05-01 17:47:59 +00:00
Ralf Becker
429177686a make home a regular application, which can eg. disabled, incl. moving all services using "home" as appname to "api" and moved some other forgotten stuff from phpgwapi&etemplate to api 2016-05-01 09:57:48 +00:00
Nathan Gray
40fbf3e2c9 Update for resource selection to re-enable conflict detection 
- Remove account & contact options from default resource selection preference
- Edit dialog participant now passes selected start & duration, so conflict detection works again
 2016-04-29 18:01:17 +00:00
Ralf Becker
0eb3619cd1 * Mail/Addressbook/Calendar: add and use charset when sending/receiving mails with vCard/iCals, change default vCard charset preference to utf-8 2016-04-29 07:51:13 +00:00
Ralf Becker
38412a1149 use new api in home and portlets 2016-04-28 18:06:46 +00:00
Nathan Gray
67faad146f Fix extra empty participant in new event for another user from planner by user view 2016-04-27 23:06:51 +00:00
Nathan Gray
91b8995938 Implement ical context menu action on single events in non-list views 2016-04-27 19:28:31 +00:00
Nathan Gray
ebc14c847c Avoid empty popup & cryptic error from drag and drop series in the past with future conflict 2016-04-27 18:53:15 +00:00
Ralf Becker
7c2b2d4950 * CalDAV: fix exceptions (EXDATE) was exported with timezone and Zulu-time, causing eM Clinet to fail 
current Horde_Icalendar only exports EXDATE in Zulu-time, so we can only remove timezone. Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
 2016-04-27 16:27:04 +00:00
Ralf Becker
df83dcf933 fix wrong replacement 2016-04-27 16:23:30 +00:00
Ralf Becker
3e92578753 fix some ocurences with: <object> instanceof <phpgwapi-class>, which is no longer true, when object is from new Api, but old <phpgw-class> extends new Api class 2016-04-27 07:10:04 +00:00
Nathan Gray
e88c3da6b8 Add missing placeholder (no rows) action 2016-04-26 23:11:29 +00:00
Nathan Gray
42ac5b8a08 Hide participants for private events 2016-04-26 20:13:14 +00:00
Nathan Gray
61029657f5 Log recurrence end date into history 2016-04-26 16:41:22 +00:00
Hadi Nategh
171a160383 Switch weekend action in toolbar with week view, as week view is more important than weekend toggle 2016-04-26 12:35:09 +00:00
Ralf Becker
1742ebf6f1 use new et2 config 2016-04-24 13:41:36 +00:00
Nathan Gray
80e935fb0b Some adjusting of calendar list sort order: 
- All filters except Before default to sorting earlier events first  (start date asc)
- For all day events for the same date, non-blocking before blocking
 2016-04-20 16:52:52 +00:00
Nathan Gray
f7588fb0ea Update to use static method for country 2016-04-19 20:25:35 +00:00
Hadi Nategh
e75a1b6348 Dialog styling W.I.P.: 
- Get all buttons fit into footer toolbar for calendar edit
- Fix tabs flicker when switching between tabs
- Fix padding right for td
- Fix general styling for buttons
 2016-04-07 12:42:27 +00:00
Ralf Becker
fc9c345930 move egw_ical_iterator to Api\CalDAV\IcalIterator 2016-04-04 23:45:39 +00:00
Ralf Becker
ca1bf71361 fix PHP Fatal error when creating/updating entries 2016-04-04 22:39:49 +00:00
Nathan Gray
3ecd30fb35 Fix no category showed blank tag in category taglist. 2016-04-04 21:40:45 +00:00
Ralf Becker
682fd42a26 move CalDAV/CardDAV server to api 2016-04-02 10:44:17 +00:00
Ralf Becker
9eb1ecbd36 fix all IDE warnings, before moving classes to api, in case we want to merge it back to 14.x 2016-04-02 08:40:34 +00:00
Nathan Gray
abd1830ec2 Fix multiple categories show as just IDs 2016-03-31 23:06:23 +00:00
Hadi Nategh
3261906a09 Mobile theme W.I.P.: 
- Implement plus button for calendar views and bring day view action into toolbar header, thanks Christoph Kaulich.
 2016-03-30 16:03:19 +00:00
Hadi Nategh
989d1ca389 Mobile theme W.I.P: 
- Fix calendar toolbar messed up with too many shown actions
- Fix SVG icons for list, planner, 4days, multiweek and today buttons
 2016-03-29 10:33:10 +00:00
Ralf Becker
db5533058d possible fix for An error happened (ErrorException): Argument 2 passed to EGroupware\Api\Etemplate::exec() must be of the type array, string given, called in calendar/inc/class.calendar_ui.inc.php on line 593 2016-03-29 09:12:56 +00:00
Nathan Gray
dc3fdfdea6 Remove invalid participant fields from export field options 2016-03-25 16:32:15 +00:00
Nathan Gray
a81cdf73be When server gives taglist options via ajax, take them all. Only filter local suggestions. 
- Filter accounts server side so they do not always show up
 2016-03-25 16:08:22 +00:00
Nathan Gray
521c28cfd5 Get planner sitemanager module working 2016-03-18 15:49:11 +00:00
Nathan Gray
f9b5b2fc1e Remove birthday / event display preference 2016-03-15 18:27:32 +00:00
Nathan Gray
70b00c8d70 Remove some unused code 2016-03-14 19:36:22 +00:00
Nathan Gray
a13035ac06 Fix event from mail did not add users as participants 2016-03-14 15:58:25 +00:00
Nathan Gray
fbe3d2cc7d Only filter accounts by calendar permission, not groups 2016-03-10 17:43:02 +00:00
Nathan Gray
a8f158e72b Add 'Today' as calendar list date range option 2016-03-09 22:38:45 +00:00
Hadi Nategh
dbd97cd37a Mobile theme: 
- Eliminates some actions from contextmenu only on mobile
 2016-03-09 12:31:55 +00:00
Ralf Becker
6f0728cd9d fix for different return values of accounts->member(s) / membership(s) 2016-03-06 16:09:58 +00:00
Ralf Becker
3971dd8915 fix use of deprecated accounts::member and accounts::membership, should be members and memberships 2016-03-06 14:58:36 +00:00
Nathan Gray
23a25e23d8 remove PHP 5.4+ array syntax breaking our PHP 5.3 support 2016-03-04 15:57:13 +00:00
Ralf Becker
4c37f90cc1 remove old no longer used stuff 2016-03-01 16:26:14 +00:00
Nathan Gray
b2d1f0edbe Fix incorrect owner/group showing for planner on home 2016-02-23 21:47:33 +00:00
Nathan Gray
17f2882639 Get calendar home less broken 
- Fix actions missing on home reload
- Fix full reload on home reload
- Fix calendar reload removed home events
 2016-02-23 21:29:13 +00:00
Ralf Becker
4121546e85 fix docu and logging as logic for change is in backend 2016-02-23 15:04:30 +00:00
Ralf Becker
1da38599b2 change ctag timeout to 29sec to get z-push ping with 30sec to request a new ctag 2016-02-23 15:02:40 +00:00
Nathan Gray
9460e1a2f9 Home improvements - Weekend toggle, weekN & month support 2016-02-22 22:45:48 +00:00
Nathan Gray
32b4872084 Use calendar-owner widget in edit dialog for participants 2016-02-18 20:54:26 +00:00
Nathan Gray
58b7f38426 Promote calendar-owner to full widget, loadable by etemplate on its own 2016-02-18 19:45:37 +00:00
Ralf Becker
61027429eb alignment of NM header 2016-02-17 19:56:54 +00:00
Nathan Gray
e3fdbd0c62 Fix removal missing events 2016-02-17 15:33:34 +00:00
Nathan Gray
5955705002 Owner widget changes: 
- Now returns results with users, then groups, then other apps
- If a result is found in the static options, the server is not queried
- 2 character limit before searching
- Change event fires on blur, not change in selection
 2016-02-11 20:30:55 +00:00
Hadi Nategh
44c29d52db Mobile theme W.I.P.: 
-Fix calendar view header
 2016-02-10 17:03:42 +00:00
Nathan Gray
26f4c6556b Fix changing status sometimes changed time(zone) 2016-02-10 00:19:55 +00:00
Nathan Gray
d7dfd44c8b Use taglist for owner 2016-02-09 20:28:57 +00:00
Nathan Gray
069da4dace Fix changes via popup edit are not shown in main (week, etc) views 2016-02-04 19:30:32 +00:00
Nathan Gray
edf60ac0f8 Completely remove any planner_days and switch to using other views for calculation 2016-02-03 18:27:52 +00:00
Ralf Becker
cd9b6b77fe fix not working download of holidays from egroupware.org, caused by not working redirect with old network class, now replaced with standard php http wrapper and use egw_framework::proxy_context() for optional proxy server 2016-02-01 11:08:39 +00:00
Nathan Gray
174387b958 Fix home showed wrong day for single days 2016-01-27 17:48:33 +00:00
Nathan Gray
794d6aee5c Fix events missing if home loaded before calendar 2016-01-27 17:35:25 +00:00
Ralf Becker
e9d48ff687 4-day-view icon incl. sources from Pixelegg, thought I had to change briteness by +80% to get a simmilar looking icon as for other calendar views 2016-01-26 14:47:05 +00:00
Hadi Nategh
1c4647492d Show caption if there's no icon available for toolbar actions 
- Remove icon from today action in calendar
 2016-01-26 13:43:00 +00:00
Nathan Gray
837e19ae2c Use new function to update client data when moving via DnD 2016-01-25 23:24:42 +00:00
Nathan Gray
0ae7ba40ce Toolbar changes: 
- Change Add button icon from new to +
- Add Today button to toolbar
 2016-01-21 18:41:54 +00:00
Nathan Gray
80ce556003 Remove view names from header 2016-01-21 18:35:53 +00:00
Nathan Gray
72991fc007 Smarter updates for recurring events, to avoid refreshing more than needed. 2016-01-20 20:58:14 +00:00
Nathan Gray
85eebd426d Fix fatal error when copying an event 2016-01-19 00:42:27 +00:00
Nathan Gray
f438940598 Fix alarms not updated when event is moved 2016-01-18 17:45:25 +00:00
Nathan Gray
2c31029f66 Fix early ajax update losing not yet saved partially entered events 2016-01-15 21:11:19 +00:00
Nathan Gray
cc53069d40 Some missing bits for Stylite theme 
- Missing new & day toolbar icons (thanks Ulle)
- Incorrect colors
 2016-01-14 21:52:40 +00:00
Nathan Gray
6b78eb9d36 More intelligent updating to avoid having to re-do a whole week when one event is added 2016-01-14 15:46:55 +00:00
Nathan Gray
15dd34edcb Re-enable/implement preference for showing events as a per-day list 2016-01-12 23:55:59 +00:00
Hadi Nategh
9afd1976a9 * Calendar/ mail integration: Fix created event out of mail has no delete button available in participants list 2016-01-12 11:13:16 +00:00
Nathan Gray
22770805c4 Use toggle for weekend in toolbar 2016-01-09 00:54:27 +00:00
Nathan Gray
000376c69d Fix sorting users in non-consolidated day view 2016-01-08 22:38:11 +00:00
Nathan Gray
d1739fd873 - Fix day view user header 
- Fix toolbar add button
 2016-01-06 20:37:29 +00:00
Nathan Gray
556495e6cc Move sidebox buttons into a toolbar 2016-01-06 18:24:45 +00:00
Nathan Gray
4d0977f8f9 - Fix inconsistency in participant / owner between planner & weekview 
- Change default participant default to selected users
 2016-01-05 22:54:33 +00:00
Nathan Gray
7d1de17438 Refactor & more intelligence in grid views for speed improvements 2016-01-05 20:43:19 +00:00
Nathan Gray
260c320ba9 Stop planner & nextmatch from fighting over events, some timing improvements 2015-12-29 22:12:30 +00:00
Nathan Gray
4792b69802 Increase default consolidation by 1 2015-12-29 16:28:29 +00:00
Nathan Gray
f08cfee22c Fix context menu action 'Add' in grid views 2015-12-29 00:19:45 +00:00
Nathan Gray
d89e847acc Add a preference for participants for new events - just me, or selected 
Applies when there is no obvious participant (clicking on a single user's calendar)
 2015-12-29 00:11:29 +00:00
Nathan Gray
bcea893927 Todo icons: 
- Use defaults for missing icons
- Prevent wrapping
 2015-12-28 17:59:47 +00:00
Nathan Gray
6dfef23ae3 Match consolidation number to the phrasing in preferences 2015-12-28 16:55:51 +00:00
Nathan Gray
ffad978c81 Move consolidation limit from config to preference, and split it into two for day & week views 2015-12-22 23:34:53 +00:00
Nathan Gray
18a7c47b95 Fix drag and dropped events in a different timezone get set to the wrong time 2015-12-22 00:26:56 +00:00
Nathan Gray
0e50aaee77 Remove no longer used preference for preselected group entering the planner 2015-12-17 00:02:38 +00:00
Nathan Gray
6236c7e1ca Add some exceptions to Month header button 
- Planner & list view stay, they just update their date to that month
 2015-12-16 19:54:22 +00:00
Nathan Gray
4aed504622 Fix drag and drop series exception in a different timezone did not remove original event 2015-12-16 00:28:56 +00:00
Nathan Gray
2e5b034ca0 - Change default weekN to 2 weeks (& fix error) 
- Remove no longer useful default view
 2015-12-15 20:06:03 +00:00
Nathan Gray
c5eac7749c When the current view is nextmatch, pass sidebox merge through the listview nextmatch action so it gets proper processing of the selected rows and nextmatch filter. 2015-12-15 16:36:54 +00:00
Nathan Gray
4503abf1bc - Fix view list hook to be able to view the list from any other application 
- Participant is not always an integer
 2015-12-12 00:07:40 +00:00
Nathan Gray
33437acb96 Keep internal date span up to date if user is using list view and week or month filter. 
Fixes some problems with strange date ranges when merging using the sidemenu selectbox
 2015-12-11 19:38:52 +00:00
Nathan Gray
8a5e720851 Revert r54516, it can cause infinite loops 2015-12-10 00:40:04 +00:00
Nathan Gray
da2d6cc321 Keep client side state up to date with month & week filters 2015-12-10 00:06:08 +00:00
Nathan Gray
b4cfde8c35 Automatically make adjustments to merge range to try to match the selected template 2015-12-09 23:12:12 +00:00
Nathan Gray
0e834e372c Add ACL check to allow editing other users events via drag and drop 2015-12-09 17:36:46 +00:00
Nathan Gray
77d4a48a5b Fix missing resource name in initial load of owner list 2015-12-08 22:29:56 +00:00
Nathan Gray
cbf2497d58 Do not check for conflicts when changing status via ajax 2015-12-08 22:13:35 +00:00
Nathan Gray
4ece177cf9 Fix exceptions on the day of series ending got copied to new series 2015-12-08 17:00:49 +00:00
Nathan Gray
9dd383c5a9 Add external owners that a select account widget will not find, so they are there on initial load 2015-12-08 00:57:45 +00:00
Nathan Gray
d547416956 Fix missing 'add' refresh call 2015-12-07 16:11:44 +00:00
Nathan Gray
7d20c6074d Fix typo breaking some merge combinations, make sure to always merge to end date 2015-12-04 20:58:37 +00:00