holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,026 Commits 27 Branches 330 Tags 157 MiB
baa4b2e455
Commit Graph

378 Commits

Author SHA1 Message Date
Nathan Gray
4e7521a33a Remove drag and drop target divs. Now using one target div and moving it around as needed. 2016-02-11 17:02:06 +00:00
Nathan Gray
c8cf2d30d8 Fix resize issues with etemplate2 / calendar 2016-02-10 16:50:42 +00:00
Nathan Gray
37be48c772 Avoid potential infinite loop due to logic evaluation order 2016-02-10 00:35:54 +00:00
Nathan Gray
d7dfd44c8b Use taglist for owner 2016-02-09 20:28:57 +00:00
Klaus Leithoff
e3f63c2564 return expected granularity when nothing or 0 is set for use_time_grid 2016-02-05 15:00:34 +00:00
Nathan Gray
c4f125a772 - Disable scrolling to change week (swipe & pg up/ pg dn kept) 
- Remove animations
 2016-02-04 21:05:31 +00:00
Nathan Gray
db7528b249 Fix weekview shown as list when preference was none 2016-02-04 19:47:57 +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
Nathan Gray
cd30a70a96 Sidebox calendar buttons 
- change button colors
- change tooltip for added buttons to match jqueryui buttons
- finally found (& removed) that 1px wiggle
 2016-02-03 16:52:28 +00:00
Nathan Gray
0be32cf840 Change sidebox calendar button order, change today icon to • 2016-02-02 22:59:13 +00:00
Nathan Gray
98bf388da7 Re-add sidebox 'month' button as go button, styled to look like calendar navigation buttons 2016-02-01 20:52:53 +00:00
Nathan Gray
7b2902f0c2 Fix (remove) right margin on sidebox calendar 2016-01-28 22:08:15 +00:00
Nathan Gray
40779b6dbf - Change all day event sorting so longer events are higher 
- Change short event display so 1 line shows title, 2-4 lines show timespan & title
- Increase maximum number of events loaded at once
 2016-01-28 21:35:22 +00:00
Nathan Gray
b5be17ad9c Fixes for errors when closing calendar tab, which broke tabs at the framework level 2016-01-28 16:59:23 +00:00
Nathan Gray
794d6aee5c Fix events missing if home loaded before calendar 2016-01-27 17:35:25 +00:00
Nathan Gray
f30cbdeb9e Some layout fixes 
- fix hidden toolbar in Safari
- fix name label shown at wrong times when switching between views & single / multi user
- better handling of not set start / end times for planner to avoid loading everything
 2016-01-26 22:17:51 +00:00
Nathan Gray
52dd6cd644 Move today button between prev & next buttons 2016-01-22 20:48:30 +00:00
Nathan Gray
edd827b221 Sidebox calendar - remove borders, header background, month button 2016-01-22 00:58:12 +00:00
Nathan Gray
ac4bef3c47 In single week view, only show the date labels once 2016-01-22 00:22:08 +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
ad05ac0cc3 Fix some months not showing enough weeks, better this time 2016-01-21 15:40:32 +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
2a91237c2a Fix some months not showing enough weeks 2016-01-19 15:37:15 +00:00
Nathan Gray
2608b63d54 Fix planner by month could not start on some months 2016-01-18 23:26:19 +00:00
Nathan Gray
a79e017ea9 Better use supplied context when adding 2016-01-18 22:48:38 +00:00
Nathan Gray
5e5139ae2e - Simplify grid sizing calculations 
- Fix non-consolidated day update
 2016-01-15 22:43:59 +00:00
Nathan Gray
932fcbc78c Align planner view to weeks 2016-01-15 00:05:02 +00:00
Nathan Gray
e4a0808693 Keep list search keywords around through an app refresh 2016-01-14 23:23:22 +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
36672c5626 Better support for storing a planner view as a favorite - detects months better 2016-01-13 22:58:20 +00:00
Nathan Gray
70686f0847 Some code cleanup 2016-01-13 22:07:09 +00:00
Nathan Gray
a05ec9ae55 Fix typo in previous commit 2016-01-13 00:27:10 +00:00
Nathan Gray
66138ad402 Better handling of time grid preference value possibilities 2016-01-13 00:24:19 +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
Nathan Gray
bad0262c4e Do not update infolog changes if calendar is not showing infolog entries 2016-01-11 20:43:52 +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
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
d9f09e1333 Single day, multiple owner now shows in a single row 
Also start of some refactoring to reduce the same code in multiple places
 2015-12-28 22:21:47 +00:00
Nathan Gray
6dfef23ae3 Match consolidation number to the phrasing in preferences 2015-12-28 16:55:51 +00:00
Nathan Gray
f01c973324 Fix wrong width for week when going from day -> planner -> week 2015-12-23 21:09:02 +00:00
Nathan Gray
17b1a3387f Fix 4 day view not showing any days, changing to planner from day or 4 day view did not properly keep the date span 2015-12-23 20:50:33 +00:00
Nathan Gray
3f96725bdb Another attempt at reducing Firefox weirdness, which might be related to the order of template processing 2015-12-23 18:15:23 +00:00
Nathan Gray
bb380e2c59 Make sure sidebox template is loaded also 2015-12-23 00:42:39 +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
7a62f96866 Planner view 
- When changing into planner view, keep the current time span
- Today button keeps displayed number of days
- Remove header arrows, planner now uses same navigation as others
 2015-12-22 20:07:40 +00:00
Nathan Gray
e1d60f6729 Favorites do not change the current date. 2015-12-21 23:03:42 +00:00
Nathan Gray
decf8efa34 Clicking week numbers changes date in any other view also (fixes it for multi-week view) 2015-12-21 18:16:32 +00:00
Nathan Gray
2ee00759bc Resolve some issues with week numbers between east & west of GMT 2015-12-21 18:14:33 +00:00
Nathan Gray
e5810f793a Avoid calendar change event and directly update state. Avoids double state change. 2015-12-18 17:18:05 +00:00
Nathan Gray
5843f28677 Make planner view headers slightly less weird, clicking on a month should view that month 2015-12-16 23:46:44 +00:00
Nathan Gray
d67cbb39e7 Tie sidebox calendar to listview, so if you click month, or click a week or day, it changes the listview filter too 2015-12-16 20:41:54 +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
67652ccaf1 Avoid js error on first calendar load when there are no preferences yet 2015-12-16 00:23:25 +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
c7167979e4 Avoid displaying more than 100 days in planner by user or category views (switching from year view), as it results in a sub-optimal user experience 2015-12-14 23:47:57 +00:00
Nathan Gray
d07ab5285f Keep hooked sidebox templates from other applications (resources) up to date as state changes 2015-12-14 22:08:12 +00:00
Nathan Gray
9252607705 A better way to make keywords only apply to list view, not the other views. 2015-12-14 20:46:25 +00:00
Nathan Gray
3dfc697c7c Fix missing participant names in sidebox & listview 2015-12-14 18:38:53 +00:00
Nathan Gray
e580e7991c Avoid error if an edit popup is opened before the calendar tab 2015-12-12 00:13:38 +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
ac08939314 Use the right variable to avoid breaking the whole app 2015-12-10 22:55:28 +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
e7fd0ff52a Fix some issues in drag and drop CSS with resizing on drop 2015-12-09 20:54:01 +00:00
Nathan Gray
d00eaa9834 Catch empty owner as array, which would also cause problems 2015-12-08 22:17:44 +00:00
Nathan Gray
bd8b9a930f Fix all day events were incorrectly prompting about series split 2015-12-08 17:19:15 +00:00
Nathan Gray
864a5f2673 Avoid some potential error conditions with missing state stuff 2015-12-08 00:22:50 +00:00
Nathan Gray
ecc189fd05 Fix some action issues 
- Keep event widget ActionObject ID matching event ID
- Add ability to pass extra data to default recur_prompt callback
- Fix open context menu action did not prompt for series vs exception
 2015-12-07 18:32:59 +00:00
Nathan Gray
ecd1ad3628 Common method to show split series warning, used for edit popup & drag and drop. Now (tries) to indicate the date the split will occur. 2015-12-04 17:37:26 +00:00
Nathan Gray
7b527d699e Fix some more cases with recurring events & drag and drop (duration changes) 2015-12-03 22:56:52 +00:00
Nathan Gray
3ec70206cd Fix some load order bugs. Firefox finishes loading list view before the sidebox, causing some discrepancies in views 2015-12-03 20:44:52 +00:00
Nathan Gray
ecb2003f4f Change calendar merging to be able to handle merging a range into a document with only pagerepeat 2015-12-02 17:34:06 +00:00
Nathan Gray
60539797af Let todo list in day view take full height 2015-12-02 16:17:04 +00:00
Nathan Gray
a71ab3b066 Sidebox calendar changes 
- Fix month button only worked once.
 2015-12-02 15:36:11 +00:00
Nathan Gray
7aabcd31a3 Sidebox calendar changes 
- Missed variable rename from previous commit
 2015-12-01 23:58:11 +00:00
Nathan Gray
619e675be5 Sidebox calendar changes 
- Move Today button, add Month button
- Calendar header no longer immediately changes main view
 2015-12-01 23:49:14 +00:00
Nathan Gray
efc7048c82 Fix holidays in sidebox calendar 2015-12-01 22:53:13 +00:00
Nathan Gray
23f9a9a75b Make sure ID is a string, prevents duplication if it gets updated to an int 2015-12-01 22:14:47 +00:00
Nathan Gray
e172ff448b Fix some app_id vs id issues breaking drag & drop 2015-12-01 22:02:47 +00:00
Nathan Gray
b1dd9f69f1 Add question back in for editing series, even if in the future 2015-11-30 18:12:26 +00:00
Nathan Gray
e2680aef64 Fix 'Today' button always showed wrong week when you clicked it on a Sunday (with weekday starts on Monday) 2015-11-30 17:55:21 +00:00
Nathan Gray
9de2bba126 Fix could not scroll to next year with certain date format preferences 2015-11-30 17:31:59 +00:00
Nathan Gray
e191075303 Fix dnd & drag resize of non-recurring events 2015-11-30 17:21:40 +00:00
Nathan Gray
ede4956797 Changes to how recurring events are split when you change them 
- Events before today can (still) not be changed
- Events after today can (still) be changed
- If you change a series by editing (or dnd) an event after today, the change is effective as of that day
 2015-11-27 16:57:25 +00:00
Nathan Gray
85135e6790 Deal with planner days set as string instead of int 2015-11-25 16:05:36 +00:00
Nathan Gray
d9b556aee1 If only one owner is selected, automatically change to single selection 2015-11-24 21:36:52 +00:00
Nathan Gray
c91b4af435 Make sure listview start & end dates stay valid 2015-11-24 17:21:37 +00:00
Nathan Gray
3373d16c71 Do not include date in state, don't want favorites to be stuck in time. 2015-11-24 16:17:00 +00:00
Nathan Gray
031b25c740 Improvement to listview header when you're looking at only 1 day 2015-11-24 16:04:44 +00:00
Nathan Gray
f8552eb5b9 Fix keyword (& other optional filters) did not work the first time 2015-11-23 22:57:05 +00:00
Nathan Gray
187614dddb Better layout for user & category selectboxes 2015-11-23 22:44:16 +00:00
Nathan Gray
c32d2287c5 Avoid wrapping owner icons if user has group + search 2015-11-23 22:01:02 +00:00
Nathan Gray
47c1839b01 Fix calendar scrolls to the last event when editing with a hidden event after work hours. 2015-11-23 21:31:21 +00:00
Nathan Gray
fb7ec13d77 Fix update did not always go to correct calendar 2015-11-23 19:59:44 +00:00
Nathan Gray
f87c905777 More fixing on the category filter, this time to make it work again 2015-11-23 17:36:21 +00:00
Nathan Gray
88a9bd6583 Fix today button always went to yesterday east of GMT 2015-11-23 17:14:52 +00:00
Nathan Gray
98b12c024b Fix bug where single events spanning 2 days did not show in the second day 2015-11-23 17:02:51 +00:00
Nathan Gray
d08a91dcff Fix bug where the refresh did not happen with multiple users selected 2015-11-23 16:50:44 +00:00
Nathan Gray
c51e9db46b Disable hidden nextmatch, should fix some disappearing events and some UI slowdown. 2015-11-23 15:51:13 +00:00
Nathan Gray
9b56ed39c3 Fix favorites with only current user (owner=0) showed first user in selection list 2015-11-20 18:05:27 +00:00
Hadi Nategh
5a6ca10c0d Check cat_id and join function are not undefined 2015-11-20 09:05:53 +00:00
Nathan Gray
614ff2627c Fix typo 2015-11-19 15:26:12 +00:00
Hadi Nategh
5f86f911f7 Make sure object is there before join(), fix not working calendar 2015-11-19 09:08:42 +00:00
Nathan Gray
0861a6d58c Fix some more sneaky caching / refresh bugs 2015-11-18 17:44:22 +00:00
Nathan Gray
22e4fc038f Send some refresh commands when deleting 2015-11-17 21:32:46 +00:00
Nathan Gray
955466d156 Fix some layout / formatting problems with 12h times 2015-11-17 20:19:47 +00:00
Nathan Gray
7467f3b855 Fix display issues with multi-day events 
- fix missing events when span is changed to cover new days
- fix events stay when changing weeks, and the new week has a day with no events
 2015-11-17 16:57:34 +00:00
Nathan Gray
98c18b04ec Fix delete of series did not work 2015-11-16 16:45:02 +00:00
Nathan Gray
c0ba0a5bcf Fix multi-day events extending outside the currently selected timespan blocked the cache for those days, leading to missing events. 2015-11-13 23:21:16 +00:00
Nathan Gray
3e054b90f7 Need more data to handle adding a recurring event 2015-11-13 20:38:29 +00:00
Nathan Gray
43e69977f2 Fix some update conditions that were missing some cases 2015-11-13 20:22:58 +00:00
Nathan Gray
4565bf4779 Sizing fixes for better (intitial) layout 2015-11-12 23:10:16 +00:00
Nathan Gray
28d4ebe407 Event display: 
- Always respect granularity in multiweek view, number of users selected doesn't matter
- Reduce multiweek options to 2 or 3
- Fix start of day positioning when there are several all day non-blocking events
- Try to work with CSS transitions and sizes a little better
 2015-11-12 01:01:21 +00:00
Nathan Gray
3209a6671c Show error message when trying to get calendars with no access. 2015-11-10 23:31:55 +00:00
Nathan Gray
cbde1b5664 Avoid error when closing home tab if calendar tab is not loaded 2015-11-10 20:04:17 +00:00
Nathan Gray
fff964f307 Better handling of drag and drop between full day and times 2015-11-10 18:35:24 +00:00
Nathan Gray
697444965d Calendar planner: 
- Fix planner category filter
- Planner by user now lists group invitations in each user's row
 2015-11-10 00:56:31 +00:00
Nathan Gray
e611d52f8e If weekend is not explicitly off, set it to on 2015-11-06 18:42:39 +00:00
Nathan Gray
d24d7ceb42 Remove debugger 2015-11-06 18:28:07 +00:00
Nathan Gray
4d9de94469 Calendar sidebox: 
- Resize sidebox calendar to fill the sidebox
 2015-11-06 18:04:39 +00:00
Nathan Gray
b4087292a8 Add toggle button for weekends 2015-11-06 00:37:23 +00:00
Nathan Gray
f742d11d45 Calendar sidebox: 
- Apply today class to calendar (background is orange)
 2015-11-05 22:47:38 +00:00
Nathan Gray
a2cb9064fa Calendar sidebox: 
- Move today button to sidebox calendar header
- Fix bug in resources select options where resources overwrote owners
 2015-11-05 21:52:43 +00:00
Nathan Gray
cc5b035d15 - Fix drag & drop breaks when changing to another application tab 
- Fix wrong ajax method called to move infologs
 2015-11-05 20:56:13 +00:00
Nathan Gray
08bbc433ae Calendar display 
- Make hidden indicators clickable
 2015-11-04 23:05:22 +00:00
Nathan Gray
36b54a7c33 Calendar display 
- Add indicators for events hidden outside of work hours
- Show hidden headers for events starting before current displayed time
- Fix scroll animation for multi-week views
 2015-11-04 21:47:52 +00:00
Nathan Gray
67b48d11c3 Calendar sidebox: 
- Move today button to sidebox calendar header
- Resources now add & remove from current owner, not replace it
 2015-11-02 23:21:59 +00:00
Nathan Gray
e1640a94a8 Calendar drag & drop: 
- Fix dropping events on events did nothing, now does something
- Dragging all day events to a time now changes from all day event
 2015-11-02 20:04:31 +00:00
Nathan Gray
7d12993e1a Do not change selected date when going to week or month view. 2015-10-29 20:33:04 +00:00
Nathan Gray
f3d166a6c5 Fix wrong date headers after crossing DST east of Greenwich 2015-10-29 19:47:01 +00:00
Nathan Gray
35f08f39b5 Calendar display issues 
- Give owner name / calendar label its own space to avoid colliding with first day header
- Full day non-blocking now have their own dedicated space
 2015-10-28 15:55:10 +00:00
Nathan Gray
625cc51c59 Fix categories would not always refresh 
Fix calendar categories would never refresh
 2015-10-27 16:55:57 +00:00
Nathan Gray
252a8fd11a Calendar scrolling, swiping and keyhandler for page up & page down 2015-10-27 16:45:37 +00:00
Ralf Becker
f60e046511 fix sometimes shown old / no longer used delete dialog, buttons in new dialog were not translated and missing tooltip 2015-10-26 15:10:39 +00:00
Nathan Gray
7e5873eefa Calendar scrolling 
- prevent fast scrolling with a touchpad
- animation while changing scrolled dates
 2015-10-21 19:53:19 +00:00
Nathan Gray
8339db86d2 Fix app header tending to show previous value for owner when calendar tab is first opened 2015-10-19 23:08:16 +00:00
Nathan Gray
642b52850b Unify app header for the different views 2015-10-16 17:32:21 +00:00
Nathan Gray
1673cc9aed Calendar tooltip style fixes for Firefox 2015-10-15 21:34:07 +00:00
Nathan Gray
4184d88027 Fix closing & reopening Calendar crashed egw 
If only 1 user selected in sidebox, add user name to app header
 2015-10-15 20:06:19 +00:00
Nathan Gray
211056ba2e More calendar bugfixes: 
- reload loop in home
- sidebox keywords did nothing
- list view participants filter was missing groups
- Sidebox user filter updates list view to match
 2015-10-14 18:10:39 +00:00
Nathan Gray
f7a8b0ed65 Calendar bugfixes: 
- App reload just reloads, not change view
- Fix caching bug
- Fix missing resource names
- Fix app header changing inappropriately
- Fix favorites not working properly.
 2015-10-14 14:32:33 +00:00
Nathan Gray
3286642374 Fix merge from listview, and handle merging from listview into a template designed for the other views (range tag, no pagerepeat) 2015-10-09 19:48:28 +00:00
Nathan Gray
b926795898 Fix integrated apps were opening in calendar edit 2015-10-07 15:34:37 +00:00
Nathan Gray
a384714a8d Calendar W.I.P 
- Change layout to show the whole 24 hour day with a scrollbar, not just work day
- Fix some translation issues (thanks Ulle) by using calendar's egw for lang calls
- Fix cache is discarded even when state doesn't change, which broke filtering (thanks Ulle)
 2015-10-05 23:45:51 +00:00
Nathan Gray
b2c78d5b6f Apply end date to list view too. Only makes a difference when selected range is used, but now it is pre-set. 2015-10-05 18:27:19 +00:00
Nathan Gray
fa62547d77 Keep user's last choice for weekend in week view 2015-09-29 16:50:49 +00:00