extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-11 17:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,833 Commits 33 Branches 356 Tags 202 MiB
a55c8135a9
Commit Graph

76 Commits

Author SHA1 Message Date
nathan
acba58111e Calendar: Fix sidebox merge 2024-09-11 11:32:25 -06:00
nathan
700cb987ea Fix calendar did not work with merge changes 
ff94af1f7d
 2024-05-21 15:10:29 -06:00
ralf
35fa439a93 fix PHP Fatal error: Declaration of calendar_merge::merge_entries(?array $ids = null, ?EGroupware\Api\Storage\Merge &$document_merge = null, $pdf = null) must be compatible with EGroupware\Api\Storage\Merge::merge_entries(?array $ids = null, ?EGroupware\Api\Storage\Merge &$document_merge = null, $options = [], ?bool $return = null) 2024-05-21 09:46:37 +02:00
nathan
86c9b97e47 Calendar: Update merge to use changes introduced with 707c57e 2021-11-23 15:50:10 -07:00
Ralf Becker
b84136cff8 fix PHP 8.0 TypeError: strpos(): Argument #1 ($haystack) must be of type string, array given 2021-11-15 14:53:35 +01:00
Ralf Becker
65ebea136e fixing/improving condition of last commit 2021-11-15 08:26:06 +01:00
Ralf Becker
b07d08a235 fix PHP 8.0 TypeError: Cannot access offset of type string on string 2021-11-15 08:00:14 +01:00
nathan
c73a7beac8 Add placeholder list for calendar & filemanager 2021-10-07 13:47:14 -06:00
nathangray
9be653e226 Adapt app-specific merges to 186e03671a 2021-06-23 11:31:47 -06:00
Ralf Becker
868135775c PHP 8 fixes 2021-03-29 16:47:19 +02:00
nathangray
151889b39c Api: Move list of common merge placeholders into parent class to reduce duplication, add link/<format> options 2020-10-06 10:56:08 -06:00
Ralf Becker
4e9c648c6a some missing translations incl. not commited EN ones 2019-03-29 15:50:37 +01:00
nathangray
a75272b1bc * Calendar - merge placeholder {{participant_emails}} now includes group members for group invitations 2018-07-24 13:34:49 -06:00
U-quokka\komaba
2da4ec91db update Japanese language files. 2018-05-12 08:24:38 +09:00
nathangray
de17d9a2ea * Calendar - new placeholders {{participant_emails}} for non-declined participants and {{participant_summary}} for a summary of participants by status 2018-02-15 11:50:55 -07:00
nathangray
47f96640c9 Don't error if a single ID is sent, just cast it 2018-02-14 10:16:06 -07:00
nathangray
85c363a79e * Calendar - Allow templates without pagerepeat or range tags to work using only the first ID 2018-02-07 11:02:50 -07:00
nathangray
e2191bfec2 Calendar - rework merge for clarity & reduce code duplication 
- fix ranges were not working from list
 - silence some warnings
 2017-12-18 14:28:46 -07:00
nathangray
632928887a * Calendar - Fix merge from list loaded endlessly instead of generating document 2017-12-15 14:27:19 -07:00
nathangray
ce9291d6e5 * Calendar - Add placeholder for birthdays {{day/birthdays}} for day table 2017-07-27 14:52:48 -06:00
nathangray
5fd6ccd409 * Calendar - Add placeholder for birthdays {{day/birthdays}} for day table 2017-07-27 14:41:16 -06:00
Hadi Nategh
508d0aa920 Try to match placeholder NENVLF with its described example 2017-02-10 10:41:43 +01:00
Ralf Becker
ac8cdda252 fix wrong namespace and replaced a couple more CreateObject 2016-07-26 09:03:02 +02:00
nathangray
5be77f5ef2 Support customfields at the beginning of content 2016-05-18 15:41:20 -06:00
nathangray
1a16869651 Add missing conversion to human values 2016-05-16 17:26:15 -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
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
b4cfde8c35 Automatically make adjustments to merge range to try to match the selected template 2015-12-09 23:12:12 +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
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
af42a71332 Fix unable to merge from listview into document that has {{pagerepeat}} 2015-11-24 22:42:46 +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
d5cceaf7d6 Fix merged dates from the event list were not timestamps, and could not be formatted 2015-07-22 14:22:28 +00:00
Nathan Gray
f0ebb448a2 Calendar et2 conversion work in progress. 
- Client side event caching
- Home fixes
 2015-07-15 16:29:10 +00:00
Nathan Gray
cd778e3c36 Add merge placeholders for participants filtered by type (group, resource, etc.) 2015-07-10 15:27:06 +00:00
Ralf Becker
c633e0033b * all aps: lower memory requirements of insert into document by skipping HTML processing, if there are no html (custom-)fields 2014-11-19 12:20:59 +00:00
Ralf Becker
3759e498d9 * Calendar: make custom fields available in table plugins for document merge 2014-10-15 19:08:26 +00:00
Nathan Gray
210ebb5706 - Add $$user/primary_group$$ common placeholder 
- Add calendar_owner/<contact> sub-placeholders, including primary_group
 2014-07-08 19:05:09 +00:00
Nathan Gray
b13ccf631c Add {{link}} placeholder to other apps 2013-03-20 14:51:09 +00:00
Nathan Gray
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Christian Binder
2fbf1d36e8 document merge helper function to allow download by HTTP POST request 2012-09-29 10:16:39 +00:00
Ralf Becker
5d7c91a66e translating status-label now when the get used, to allow calendar_boupdate::_get_event_details() use language of to notify user 2012-05-15 13:23:11 +00:00
Nathan Gray
2452e2a4b0 Make sure ID is an array before treating it as an array 2012-04-16 19:19:44 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Nathan Gray
ddd13e8620 Add 'selected' day table for daily schedules 2012-02-16 16:55:42 +00:00
Nathan Gray
637b2c9150 Fix link ids (copy/paste error) 2012-01-16 15:38:27 +00:00
Nathan Gray
871701d774 Fix links/[app] merge tag - copy/paste error 2012-01-13 19:49:19 +00:00
Nathan Gray
02861daf88 Add mergeprint tag for links to a specified application: links/appname 2012-01-06 18:35:34 +00:00
Nathan Gray
4ab5f97ed0 Add {{links}}, {{attachments}}, {{links_attachments}} placeholders 2011-10-26 16:45:38 +00:00