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

3836 Commits

Author SHA1 Message Date
Nathan Gray
000376c69d Fix sorting users in non-consolidated day view 2016-01-08 22:38:11 +00:00
Nathan Gray
0431ebf38b Fix action conflict with sidebox 2016-01-06 22:42:52 +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
4439abc2b1 Change child category indicator 2016-01-05 21:34:49 +00:00
Nathan Gray
7d1de17438 Refactor & more intelligence in grid views for speed improvements 2016-01-05 20:43:19 +00:00
Nathan Gray
34d896f8ee Fix timescale resizer 2015-12-29 22:36:20 +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
4b5bb644f7 Fix refresh while calendar tab is hidden caused events to be minimum height 
Second attempt
 2015-12-29 16:20:50 +00:00
Nathan Gray
ad689951a2 Mark categories with children in planner by category 2015-12-29 16:01:27 +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
94b80f7790 - Planner view uses a date object internally 
- Avoid ID conflicts between rows and events
 2015-12-28 23:33:29 +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
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
e4f6b60db9 Fix refresh while calendar tab is hidden caused events to be minimum height 2015-12-28 16:25:53 +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
a13f9cd3c9 Load sub-categories immediately, or if they are not already cached they will be missing. 2015-12-22 21:35:08 +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
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
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
a6a104fba6 Planner view 
- Fix wrong month end in month header
 2015-12-17 23:52:49 +00:00
Nathan Gray
7e445d2d6b Planner view 
- Make week header slightly less weird - Fix trailing partial weeks
 2015-12-17 23:38:16 +00:00
Nathan Gray
f36fe66fe3 Planner view 
- Make week header slightly less weird
 2015-12-17 23:28:47 +00:00
Nathan Gray
db071039a4 Planner view 
- Fix missing rows with planner by user, group selected
 2015-12-17 23:13:26 +00:00
Nathan Gray
c3900b27a4 Planner view 
- Fix extra sub-category events when hiding empty rows
 2015-12-17 22:43:22 +00:00
Nathan Gray
cd9381c223 Planner view 
- Make week header slightly less weird
- Fix missing sub-category events
 2015-12-17 22:24:28 +00:00
Nathan Gray
a22f945e8c Shrink hidden event placeholder by 1px more 2015-12-17 20:12:10 +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
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
fc48eab1e7 Correct header holidays east of GMT 2015-12-16 23:06:42 +00:00
Nathan Gray
7bbe8b0152 Planner view time indicator should be hidden until needed 2015-12-16 22:58:26 +00:00
Nathan Gray
db675f2fda Planner view categories 
- Use standard order (hierarchy / alphabetical)
- Implement hidden rows preference
- If no specific categories are chosen, group into top-level categories
 2015-12-16 22:54:00 +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
66321e8527 Shrink hidden event placeholder by 1px 2015-12-16 18:39:05 +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
67652ccaf1 Avoid js error on first calendar load when there are no preferences yet 2015-12-16 00:23:25 +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
f0bfbbd687 Limit chozen dropdown height so it stays in the tab 2015-12-15 18:58:52 +00:00
Nathan Gray
9a53499c77 Fix events oversized by the border height 2015-12-15 17:43:03 +00:00
Nathan Gray
4d5f8da0c9 Use background color if border color is white 2015-12-15 17:07:19 +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
0d10639848 Do not use white for out of view events, it is too hard to see 2015-12-15 00:06:00 +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
fdfad272aa Fix some extra next buttons in the planner header 2015-12-14 23:46:45 +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
6a8b5bc629 Make keywords only apply to list view, and clear the box after setting it 2015-12-14 19:32:04 +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
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
c2c2c6c672 Make sure date is not an object before passing it along, or it cannot be in the URL 2015-12-11 19:52:52 +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
b4cfde8c35 Automatically make adjustments to merge range to try to match the selected template 2015-12-09 23:12:12 +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
0e834e372c Add ACL check to allow editing other users events via drag and drop 2015-12-09 17:36:46 +00:00
Nathan Gray
948b462e45 Set ID when passed 2015-12-09 16:23:40 +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
d00eaa9834 Catch empty owner as array, which would also cause problems 2015-12-08 22:17:44 +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
786cfbb040 Listen to tab changes to avoid scroll to top in Firefox 2015-12-08 21:54:40 +00:00
Nathan Gray
dfa30deb56 Do not scroll time grid when you're dragging over the header. 2015-12-08 19:27:25 +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
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
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
d547416956 Fix missing 'add' refresh call 2015-12-07 16:11:44 +00:00
Nathan Gray
84da22b93d Do not ask about modifying series when creating an exception 2015-12-07 15:48:29 +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
Nathan Gray
003b090103 Fix exceptions before split time were disconnected from original series 2015-12-04 19:52:53 +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
585c856307 Sidebox calendar changes 
- Fix month button only worked once.  Again.
 2015-12-03 20:51:55 +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
Klaus Leithoff
3f861274aa first shot at missing (recurring) appointments 2015-12-03 15:55:48 +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
9a97d108a5 Fix recurring private events breaking things 2015-11-25 17:20:30 +00:00
Nathan Gray
85135e6790 Deal with planner days set as string instead of int 2015-11-25 16:05:36 +00:00
Hadi Nategh
cbfb44e551 Make sure the state is an array 
- Fix not working update script from commit 54367
 2015-11-25 09:01:14 +00:00
Nathan Gray
af42a71332 Fix unable to merge from listview into document that has {{pagerepeat}} 2015-11-24 22:42:46 +00:00
Nathan Gray
c4752fa83a Changing the keywords changes to listview 2015-11-24 21:39:00 +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
6fe2c71642 Make event icons smaller, make event tooltip bigger 2015-11-24 20:05:45 +00:00
Nathan Gray
422ecd25a9 Add labeled week & month filters for list view 2015-11-24 19:45:00 +00:00
Nathan Gray
b034eeac92 Fix changing recurring end date to earlier always gave one extra recurrence 2015-11-24 18:15:11 +00:00
Nathan Gray
f4fc9a464e Remove some more dates from favorites 2015-11-24 17:55:11 +00:00
Nathan Gray
c91b4af435 Make sure listview start & end dates stay valid 2015-11-24 17:21:37 +00:00
Nathan Gray
e9e6d8f5ab Remove dates stored in favorites 2015-11-24 16:38:04 +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
Klaus Leithoff
7a99c3f8a5 improve ical2array as it messed up the ical information on recurring calls 2015-11-24 16:05:01 +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
dd6df6b077 Change listview filter options to include date 2015-11-24 00:18:37 +00:00
Nathan Gray
3a875a433d Changes to event icons: 
- Show private flag to users who can see the data
- Include app icon for other app entries
 2015-11-23 23:32:45 +00:00
Nathan Gray
5088739a86 Fix wrong user name on initial load of list view 2015-11-23 23:18:05 +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
871efde40d Yearly planner does not show infologs 2015-11-23 22:06:31 +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
32d562822b Use ellipsis for long user names, show the whole user name on hover 2015-11-23 20:51:07 +00:00
Nathan Gray
46229e0860 Fix clicks in hidden event bar carried through to timegrid, causing unwanted add event dialog 2015-11-23 20:03:37 +00:00
Nathan Gray
cb416017c9 Fix column z-order was not always right, causing some conflicting events to be covered 2015-11-23 20:00:31 +00:00
Nathan Gray
fb7ec13d77 Fix update did not always go to correct calendar 2015-11-23 19:59:44 +00:00
Nathan Gray
adb64aa0b8 Fix removing recur end date did not change recurrences 2015-11-23 19:23:39 +00:00
Nathan Gray
2b6eacd472 Fix specifying owner as an array quietly failed 2015-11-23 18:01:21 +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
Hadi Nategh
0a84301800 * Calendar/edit: Fix broken tooltip for participant image in conflict dialog 2015-11-23 10:30:21 +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
c7a049b856 More styling for calendar toggle weekend slide-switch 2015-11-19 13:31:49 +00:00
Hadi Nategh
d1044795a8 Fix styling slide-switch for calendar toggle weekend 2015-11-19 10:53:46 +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
174a63f86f Make dragging/dropping over events work even if you do it right on the event. 2015-11-18 18:40:52 +00:00
Nathan Gray
0861a6d58c Fix some more sneaky caching / refresh bugs 2015-11-18 17:44:22 +00:00
Nathan Gray
adbc4d2b8b Fix one more case where full update is needed. 2015-11-18 16:19:34 +00:00
Hadi Nategh
3a5aa9ac5c Implement slide-switch, representing checkbox on/off status 
- Replace calendar toggle weekend checkbox with slide-switch
 2015-11-18 15:42:32 +00:00
Nathan Gray
22e4fc038f Send some refresh commands when deleting 2015-11-17 21:32:46 +00:00
Nathan Gray
c3464e4552 Nicer formatting in tooltip for multiple categories, and still working with single categories 2015-11-17 20:56:47 +00:00