Nathan Gray
f6a443a917
Add warnings to import plugin
2011-12-15 16:24:47 +00:00
Nathan Gray
3ca10ad0c5
Add ability to create tracker from infolog to the infolog context menu
2011-12-13 18:25:08 +00:00
Nathan Gray
2f4d8848c5
- Remove previously added hook & base class, turns out there's an established way to do it...
...
- Use existing link_app type hook to create calendar from infolog
2011-12-12 21:51:12 +00:00
Nathan Gray
e75a93713a
Translation for error message in #37485
2011-12-12 20:40:19 +00:00
Nathan Gray
0d78c2e919
Add ability to link to another record based on matching custom field when importing
...
For translation, use '<appname>:<cf_name>:|[field_index]', eg addressbook:import_id:|[5] where field_index is the index of the field with the value to match
2011-12-12 20:32:45 +00:00
Nathan Gray
332427277d
Add ability to create calendar entries from infolog entries, using new base so other apps can be added (hopefully) easily later
2011-12-08 23:20:49 +00:00
Nathan Gray
7b2fd55d83
Change Startdate & Enddate to match UI, Start date & Due date
2011-12-08 15:25:56 +00:00
Nathan Gray
fb4982c118
Avoid failing on modification date check, which looked like a permission error.
2011-12-07 16:37:56 +00:00
Nathan Gray
7f48378cff
ADD ACL doesn't mean add in infolog, so use edit OR add for new entries
2011-12-07 15:28:32 +00:00
Nathan Gray
5b5a6bb625
Add check for add access if entry to be saved has no ID, and type has an owner - prevents inserting (importing) into restricted types
2011-12-06 23:30:48 +00:00
Nathan Gray
f7b8997be3
Set default status when importing, if not specified in file
2011-12-06 23:05:46 +00:00
Nathan Gray
abe612461c
Fix conditions using custom fields - needed extra query key
2011-11-30 18:01:29 +00:00
Nathan Gray
9db9804c14
Exclude vfs when looking for info_link_id links, doesn't look possible to link to a file for this field
2011-11-29 00:42:00 +00:00
Nathan Gray
eb95a1b1db
Search & process records in batches of 500, pre-load info_link_id in one query
2011-11-29 00:21:15 +00:00
Nathan Gray
5d77dbfdc9
Optimizations:
...
- Only load bo once in egw_record, and re-use it
- Only load projects if requested in the export definition, and do it all at once
2011-11-25 23:10:39 +00:00
Nathan Gray
e5cbfc5601
Move handling of filter by date from user interface into logic layer
2011-11-24 17:56:05 +00:00
Klaus Leithoff
b11e7f9291
fixing an en/de- coding issue, regarding the attaching of an .eml file to the infolog in question when converting an email -with german umlauts within the subject line- to infolog and adding the original email to it.
2011-11-21 12:41:58 +00:00
Ralf Becker
7c9dd8086f
changed "No defintion" to "Old fixed definition"
2011-11-21 10:01:08 +00:00
Nathan Gray
1afba81ce8
Add 'No definition' option for default export definition preference. Allows use of legacy nextmatch CSV export with Import/Export app still available
2011-11-18 16:01:57 +00:00
Klaus Leithoff
8fdb682c90
add missing config translation for new config option to exclude fields from copying
2011-11-18 08:48:28 +00:00
Klaus Leithoff
8f0f3a92c3
* eMail/infolog: mail to infolog, preference (and action) to allow the additional attaching of the raw mail message as message/rfc822 (.eml) to the entry
2011-11-17 16:05:36 +00:00
Ralf Becker
f255a2396a
new InfoLog configuration: Load custom fields in index, if filtered by selected types (eg. to display them in a type-specific index template)
2011-11-17 09:30:30 +00:00
Hans-Jürgen Tappe
eceec44c78
Fix a typo.
2011-11-12 09:50:45 +00:00
Klaus Leithoff
3541fc7129
fix bug regarding the default of info_status
2011-11-10 14:14:35 +00:00
Klaus Leithoff
c5946b62ce
fix bug regarding the saving of excluded field (once selected, you could not deselect fields)
2011-11-10 14:05:03 +00:00
Klaus Leithoff
2946928c69
add function header/doku for get_validtypes
2011-11-10 13:44:57 +00:00
Klaus Leithoff
5869d59d12
while copying infologs - handle defaults
2011-11-10 13:38:23 +00:00
Klaus Leithoff
0d916de566
* infolog: allow to exclude fields while copying an infolog entry; done via infolog->configuration
2011-11-10 12:17:35 +00:00
Nathan Gray
5878768532
Change {{links}} to exclude files, {{links_attachments}} is everything
2011-10-26 15:06:37 +00:00
Nathan Gray
79c669c6cb
Add placeholder for attachments
2011-10-25 22:52:34 +00:00
Nathan Gray
adfe721ba7
Implement links placeholder
2011-10-25 22:39:16 +00:00
Philip Herbert
0b924e9e6e
esync: fix for not updated calender, contact, task on device if only description or note was changed in EGroupware. Also fixing issue that values in these fields could not be deleted on several devices.
2011-10-23 18:16:41 +00:00
Ralf Becker
e3eed0533c
seems iCalendar::getAttribute() can return a PEAR_Error too
2011-10-23 08:35:38 +00:00
Ralf Becker
d898e6c627
calendar-timezone needs full vcalendar component, not just a vtimezone
2011-10-20 14:01:16 +00:00
Ralf Becker
ceaec3d3c1
added calendar-timezone property, changed groupdav_handler::extra_properties signature (removed static and added $user parameter), removed calendar-user-address-set property belonging only to principal
2011-10-20 13:35:01 +00:00
Ralf Becker
fe05746b11
remove unusual and unnecessary "EGw-...-wGE" prefix/postfix from etag and ctag
2011-10-11 17:30:15 +00:00
Ralf Becker
c2f74d0c72
* CalDAV: fixed wrong VTIMEZONE component generated (has to be in UTC), probably fixes bug #2984 : Problem with VTIMEZONE component generated for NZ
2011-10-08 18:40:29 +00:00
Ralf Becker
4613f6eb8a
even as EGroupware only displays the date, we can still store the full value, it only get truncated, when infolog get saved in webgui
2011-10-08 12:46:56 +00:00
Ralf Becker
b2fa12eb3e
remove unusual and unnecessary "EGw-...-wGE" prefix/postfix from etag and ctag
2011-10-08 11:34:55 +00:00
Ralf Becker
e9f4f4f3b3
if client set an own filter, reset the open-standard filter
2011-10-07 09:05:11 +00:00
Ralf Becker
8f0abbe004
implemented rfc4791#section-9.9 complient time-range filter
2011-10-06 10:29:01 +00:00
Ralf Becker
f1029c07c9
added EGroupware PRODID and DURATION for VTODO
2011-10-05 09:24:08 +00:00
Ralf Becker
e05ce4d614
enclosing etag in quotes, as most servers do
2011-10-05 08:15:24 +00:00
Ralf Becker
23584253fd
not returning deleted entries for read, as they might have identical UID for caldav_name as a non-deleted entry and would therefore block access to these
2011-10-04 14:18:35 +00:00
Ralf Becker
0de2f3c527
fixed profind depth 0 directly on a resource contains name-part twice
2011-10-04 12:16:03 +00:00
Ralf Becker
288a88239b
we should not return an etag here, as we never store the PUT ical byte-by-byte
2011-10-03 15:48:24 +00:00
Ralf Becker
175197d7c0
* CalDAV: no METHOD:PUBLISH for CalDAV outside the inbox
2011-10-03 12:53:28 +00:00
Philip Herbert
e34de4afe8
esync/infolog plugin, complete status can now be set/reset
2011-09-30 14:28:26 +00:00
Ralf Becker
b11fa0302f
* CalDAV/GroupDAV: return empty collection, as iCal under iOS 5 had problems with returning "404 Not found" status
2011-09-30 12:52:40 +00:00
Philip Herbert
90bc88449a
fixed typo
2011-09-30 09:32:16 +00:00
Klaus Leithoff
65d63c3fb5
make sure, we use the info_id on conditional actions
2011-09-29 13:01:32 +00:00
Ralf Becker
79e51d3cb8
fixed $infolog is no array
2011-09-29 10:55:00 +00:00
Ralf Becker
4889fd91b8
documented infolog_bo::getctag() signature and fixed call in infolog_activesync (disabled call to not used and currently broken egw_index)
2011-09-29 06:17:42 +00:00
Philip Herbert
1284adbccf
esync:commit work in progress, infolog plugin - not yet working
2011-09-28 23:21:49 +00:00
Ralf Becker
620ae14f9a
* eSync/InfoLog: InfoLog support for ActiveSync, not yet tested, as I have currently no device to test
2011-09-28 13:16:40 +00:00
Ralf Becker
c4865bb067
* CalDAV/GroupDAV/InfoLog: making synced InfoLog types configurable and moved getctag method to infolog_bo in preparation of InfoLog eSync support
2011-09-28 12:37:06 +00:00
Ralf Becker
bb4b9819b0
* CalDAV/GroupDAV/InfoLog: making synced InfoLog types configurable and moved getctag method to infolog_bo in preparation of InfoLog eSync support
2011-09-28 12:35:53 +00:00
Ralf Becker
1f39e5c562
- added WebDAV ACL props supported-privilege-set and current-user-privilege-set
...
+ currently only standard WebDAV privileges: read, read-current-user-privilege-set, write-content, bind and unbind used
+ they get only queried for collections, thought we dont report any write* on collections, as we dont allow to create calendars or change properties
- new groupdav::add_resource() method used to add all resources (incl. collections) to propfind or report requests
- improved autoindex to show nicely indented hierarchical properties
2011-09-21 20:08:21 +00:00
Ralf Becker
03ed1d3ddb
- refactored code to use a single add_collection method in groupdav class
...
--> app groupdav classes now get calling groupdav object as parameter
Had a quick test with iOS & OS X addressbook, calendar and with Lightning
2011-09-18 10:56:56 +00:00
Ralf Becker
89847abae6
added "progress"(-bar) widget to differ from image and using it in templates
2011-09-08 19:00:57 +00:00
Ralf Becker
41952d70ea
removed not used config
2011-09-08 18:59:02 +00:00
Klaus Leithoff
8d9003fbf8
fix bug that prevented the editing of own infologs, if no grouprights are set, and history config for application infolog is not set
2011-07-07 08:19:31 +00:00
Nathan Gray
aab8157907
Translation for placeholder labels
2011-07-05 21:44:21 +00:00
Nathan Gray
e1fce75a74
Cleanup translations - common importexport stuff
2011-07-04 20:06:30 +00:00
Nathan Gray
d3ccca9874
Fix missing appname
2011-07-04 20:04:42 +00:00
Nathan Gray
31d1e20bdc
Fix typo: definitition -> definition
2011-07-04 20:00:26 +00:00
Nathan Gray
c4282c4946
Cleanup translations - move common stuff into preferences
2011-07-04 19:07:48 +00:00
Ralf Becker
03e379e570
* jQuery: changed $ to $j to work around mootools use in Joomla templates and other js code in imported projects
...
required to change $ --> $j:
phpgwapi/*
jdots/*
etemplate/*
stylite/*
felamimail/*
admin/*
news_admin/*
projectmanager/*
importexport/*
infolog/*
ranking/*
required, but not automatic:
importexport/setup/etemplates.inc.php
phpgwapi/js/jquery/*
negative, not to touch or revert later:
phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php: '(\$(.+))' => 'print $1',
phpgwapi/js/dhtmlxtree/libCompiler/core.js
sitemgr/*
phpfreechat/*
gallery/*
activesync/include/smb.php: '^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
etemplate/inc/class.bo_merge.inc.php: if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))
find phpgwapi jdots etemplate stylite felamimail admin news_admin projectmanager importexport infolog ranking \
\( -name '*.php' -o -name '*.js' \) -exec grep -q '\$(' {} \; -print \
-exec sed -i '' 's|\$(|$j(|g' {} \;
svn revert phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php phpgwapi/js/dhtmlxtree/libCompiler/core.js \
importexport/setup/etemplates.inc.php phpgwapi/js/jquery/jquery.js etemplate/inc/class.bo_merge.inc.php
additional changes:
phpgwapi/js/jquery/jquery.js: window.$ --> window.$j
phpgwapi/js/egw_json.js:291 this.request = $j.ajax({url: this.url,
jdots/templates/jdots/head.tpl:59 $j(document).ready(function() {
phpgwapi/js/egw_action/egw_grid_view.js: $.browser --> $j.browser
importexport/setup/etemplates.inc.php: etemplate editor importexport.wizard_basic_export_csv.choose_fields onclick of check icon changed
phpgwapi/js/egw_action/tests/*.html
phpgwapi/js/egw_action/tests/js/jquery.js: window.$ --> window.$j
2011-07-03 09:00:36 +00:00
Ralf Becker
dbced2bf48
fixed PHP Warning: array_key_exists(): The first argument should be either a string or an integer
2011-07-02 09:09:16 +00:00
Ralf Becker
0ed8be96b5
fixed "jumping" (different hight) tabs
2011-06-28 16:22:04 +00:00
Ralf Becker
34a990e6ac
fixed since r29490 not working private attribute
2011-06-26 13:18:30 +00:00
Ralf Becker
ca68eb8089
fixed typo
2011-06-26 13:11:00 +00:00
Ralf Becker
04be4c57fe
- new registry attribute "file_access_user" to signal "file_access" method understands new 4th parameter $user
...
- infolog implementation for it
--> allows to check if a given user has access to a files of app/id
2011-06-26 12:32:06 +00:00
Ralf Becker
9bcc95b3d7
fixed warning
2011-06-26 12:25:33 +00:00
Oscar Manuel Gómez Senovilla
164871ec02
Update Czech translation for trunk. Tracker #2886
2011-06-23 13:53:19 +00:00
Ralf Becker
2bf55a7c87
some fixes for English and Suomi translation, from our Suomi resident here as Stylite
2011-06-22 15:53:36 +00:00
Nathan Gray
275a1d3f27
Change category list links
2011-06-21 21:14:51 +00:00
Ralf Becker
8e7c73dd84
some fixes for English and Suomi translation, from our Suomi resident here as Stylite
2011-06-16 13:01:29 +00:00
Nathan Gray
d90a2c1ade
- Set dates back to original timezone when done writing
...
- Use usertime for importing email, same as displayed in felamimail
2011-06-15 17:32:12 +00:00
Ralf Becker
1774e5674f
support for multiple space or comma separated download dirs
2011-06-14 10:48:15 +00:00
Ralf Becker
220af27f60
Create template directory and set default document_dir preference of addressbook, calendar, infolog, tracker, timesheet and projectmanager
2011-06-11 11:57:51 +00:00
Ralf Becker
fcfbd038bc
some fixes for the English translation, from our Suomi resident here as Stylite
2011-06-10 06:19:36 +00:00
Nathan Gray
a70b03614f
Give an error if user uses context menu to change type to one with a required custom field
2011-06-07 23:01:49 +00:00
Ralf Becker
db9d5bf6b1
switching legacy-actions off by default
2011-06-07 09:26:07 +00:00
Ralf Becker
9dfdabe1a3
some fixes for the English translation, mostly correcting case, from our Suomi resident here as Stylite
2011-06-07 06:29:49 +00:00
Ralf Becker
ed8c386a12
using egw_refresh to allow fmail to ignore the saved/deleted message
2011-06-06 15:11:25 +00:00
Ralf Becker
8d7d6e1480
get delete confirmation working again, after change to global actionManager
2011-06-03 08:55:18 +00:00
Jörg Lehrke
768ef4c40e
fix for egroupware.org bug #2824 : SyncML ingnored multiline descriptions in infolog
2011-06-02 18:14:53 +00:00
Ralf Becker
3de54c6812
calling the global action-object-manager
2011-06-02 16:54:26 +00:00
Ralf Becker
d61ccc9bc4
icon to undelete
2011-06-01 15:52:47 +00:00
Ralf Becker
486e99ec0c
- Implemented a hook for timesheet_ui::edit to query calling apps for additional information to set in new tickets incl. links.
...
Replaces existing $_GET parameters, which are hard to set for new action system.
- also adding category color to infolog and tracker
2011-05-30 14:21:27 +00:00
Nathan Gray
c81bd1a291
Change default charset from utf-8 to user's preferred charset
2011-05-24 15:57:16 +00:00
Nathan Gray
cae8752274
Make default import definitions available only to admins
2011-05-24 15:40:22 +00:00
Ralf Becker
7de4e0108d
infolog view uses now the edit popup in a readonly mode, reverting r34950, as it does not solve the problem for entries without edit rights
2011-05-18 14:18:37 +00:00
Ralf Becker
fe62956a96
allow to require custom fields to be filled out by users
2011-05-18 10:25:39 +00:00
Nathan Gray
6f2050fa7e
Handle special case if viewing parent / sub and the parent has no (visible) sub entries
2011-05-16 15:53:03 +00:00
Ralf Becker
81ea3b639c
- using now nm_(open|hide|submit)_popup and nm_action => 'open_popup'
...
- fixes not working actions in InfoLog list in Addressbook view
- fixed not working adding/removing of responsible users
2011-05-07 08:51:35 +00:00
Ralf Becker
d982883959
renamed 'action' to 'multi_action', as InfoLog already uses 'action' and using 'action' broke a lot existing functionality
2011-05-06 18:13:10 +00:00
Nathan Gray
ec61c6268f
Allow documents in dirs other than user's preference dir by passing full path
2011-05-05 21:41:40 +00:00
Ralf Becker
1a0826b182
added undelete action and show parent infolog title for subs view (one sub only) in app_header
2011-05-05 10:18:38 +00:00
Ralf Becker
504b762ff7
fixed empty subs view, if subs are deleted and an other warning
2011-05-05 07:56:58 +00:00
Ralf Becker
c0c2a0ed0e
- fixed not working delete - was commented ;-)
...
- using original labels, for which we have translations
- always confirm with popup, not javascript confirm (makes things a lot easier)
2011-05-05 06:30:44 +00:00
Nathan Gray
0ccd420b6b
Use action system to select all
2011-05-04 17:41:51 +00:00
Nathan Gray
cb4f68cd3d
Make template changes to v1.9.002
2011-05-04 17:17:23 +00:00
Nathan Gray
03cd666e8b
Implement client side delete confirmation
2011-05-03 23:31:40 +00:00
Ralf Becker
19cb4ca8d4
- got delegation and link via context working
...
- fixed sometimes not working context, because row id was not set
- disabling close and close all if not applicable
2011-05-03 07:26:32 +00:00
Ralf Becker
30b922f30e
- fixed not working switching legacy actions columns on again
...
- moved some translations to common
2011-05-03 06:26:56 +00:00
Nathan Gray
e92173afdd
Work on context actions:
...
- Implement view of multiple selected parent / subs
- Implement link + delegation popups
- Fix filemanager action
- Change action selectbox to button, as in timesheet
2011-05-03 00:14:44 +00:00
Ralf Becker
1ef6edd5e8
Context menu for InfoLog: NOT YET COMPLETET, SOME STUFF WILL NOT WORK!
...
ToDo:
- implement view subs or parent from context
- test all context actions (some do not work)
- test CSS based disabling of actions
- change delegation or links popup not yet working (just an alert in index.js)
- delete of entries with subs (serverside confirmation displaying subs) probably not working
2011-05-02 19:41:21 +00:00
Ralf Becker
ba25d07453
svn propset svn:keywords Id
2011-05-02 13:59:29 +00:00
Ralf Becker
9c9276638e
fixed wired indention
2011-04-27 16:33:23 +00:00
Ralf Becker
5c47626dc5
using new historylog custom field stuff, storing custom fields now on a per field basis
2011-04-20 06:31:45 +00:00
Nathan Gray
dd9d78d29a
Make sure line breaks (emails) get preserved when merging
2011-04-18 18:54:11 +00:00
Nathan Gray
9f8aa313df
Add pm_id & project to list of placeholders
2011-04-14 14:44:56 +00:00
Nathan Gray
ccbe2dfb04
Add project name to list of fields available for export
2011-04-14 14:40:29 +00:00
Nathan Gray
16cd36c017
Add Project ID to list of exportable fields
2011-04-13 18:53:37 +00:00
Ralf Becker
3d94b7a0c2
fix for bug #2935 : Infolog edit broken in latest revision
2011-04-13 06:00:09 +00:00
Ralf Becker
2e4c048e9e
fixed not working setting of links for new entries after r34606
2011-04-12 11:53:34 +00:00
Ralf Becker
418fd825b2
fix for bug #2935 : InfoLog edit broken: call to member function on non-object
2011-04-12 06:10:34 +00:00
Ralf Becker
e3ad932afa
fixed catchable fatal error "infolog_so::read() parameter 1 is no array" after CalDAV commit
2011-04-11 13:45:35 +00:00
Ralf Becker
fd56c47151
* InfoLog/CalDAV: allowing clients to specify URL (name-part), as required by CalDAV spec
2011-04-11 09:29:39 +00:00
Nathan Gray
f192583f58
- Move around field types into egw_record class
...
- Add Infolog ID field to importexport
- Fix import condition matching
2011-04-07 15:28:45 +00:00
Nathan Gray
24162325bb
Default selection to search results
2011-03-28 21:51:45 +00:00
Nathan Gray
ff58170fb9
In wizard step, rename 'owner' to 'record_owner'. owner overwrites the definition owner.
2011-03-23 21:36:53 +00:00
Nathan Gray
766391754c
Fix for import / update search for existing record. If new record key (ex ID) was not set, search matched all
2011-03-21 23:02:22 +00:00
Nathan Gray
5d4b6fac2f
Set default export definition
2011-03-21 16:13:00 +00:00
Klaus Leithoff
1f66093694
* infolog: when breaking overlong words into fitting pieces, do not break lines that are tested positive to contain links. (reported as Helpdesk issue #1324 in Stylite tracker)
2011-03-21 16:12:55 +00:00
Stefan Becker
6a418aec6b
adding German Translations
2011-03-21 11:33:32 +00:00
Nathan Gray
1a210d13be
Missed etemplate changes to add CC field
2011-03-10 16:44:22 +00:00
Ralf Becker
c8bf14e1fc
bofelamimail --> felamimail_bo
2011-03-10 12:51:45 +00:00
Nathan Gray
fbc9aa8abb
Automatically handle converting+adding text categories without explicit translation
2011-03-09 18:21:51 +00:00
Stefan Becker
1f4bb2ed16
fixed typos
2011-03-09 08:52:24 +00:00
Nathan Gray
579d813ec9
* Add Cc field to Infolog
2011-03-08 19:18:07 +00:00
Ralf Becker
3bb9e89bcf
* CalDAV/Lightning: fixed under some conditions infinit poping up alarms and user not able to add alarms
...
- Lightning pops up alarm, until Sequence/etag get updated: if user has no edit rights on an other users calendar, etag never got updated, now we update it
- fixed user was not able to add alarms via CalDAV, if he had no edit rights for event (was always possible in web UI)
- alarms from other users calendars are not included any more, as they make no sense but a lot of trouble
- fixed wrong condition on adding alarms, causing some alarms no being saved
2011-03-05 10:21:32 +00:00
Stefan Becker
0fe5b21688
translations for Infolog
2011-03-04 13:04:37 +00:00
Stefan Becker
cd43df3b16
improved German Translation
2011-03-03 15:45:45 +00:00
Stefan Becker
5d9d20a143
improved German Translation
2011-03-03 15:43:45 +00:00
Nathan Gray
d59c8f06c4
By default, export all custom fields, use field labels instead of names
2011-03-02 17:14:49 +00:00
Nathan Gray
87945f9a43
Change default export to use labels, human friendly values
2011-03-02 01:08:57 +00:00
Nathan Gray
54a93e0480
Add preference to use import/export definition for exporting from nextmatch
2011-02-28 17:43:01 +00:00
Stefan Becker
002bb81b48
add German translation and fixed some typos
2011-02-24 14:19:05 +00:00
Ralf Becker
6edb314931
* correctly parsing of "time-range" REPORT filter, giving a SQL error before because it requires comparing as unix timestamp not strings
2011-02-23 10:59:12 +00:00
Nathan Gray
3296d09385
Change display of placeholder tags from 2432...2432 to {{...}}
2011-02-18 17:03:20 +00:00
Nathan Gray
ebffdf2f53
Provide proper history widget for Last changed, and stop any more from being logged
2011-02-17 00:10:51 +00:00
Christian Binder
96ab59b2fd
Enable calendar items for projectmanager eRoles
2011-02-09 20:55:20 +00:00
Christian Binder
320297bae1
reverted rev 33740 because this breaks contact expansion for infologs - sorry - jaytraxxs mistake - a final solution will follow ASAP
2011-02-07 17:19:44 +00:00
Christian Binder
509306fcf8
exclude field "info_link" for merge which contains an array and cannot be handled this way by bo_merge
2011-02-07 10:44:08 +00:00
Nathan Gray
7f3baa2639
Disable merge icon if user has no document set
2011-02-04 16:02:18 +00:00
Nathan Gray
ab54bf675f
Remove unneeded calendar stuff, add contact expansion
2011-01-31 17:26:22 +00:00
Oscar Manuel Gómez Senovilla
28d2b6b072
Update for translations in trunk
2011-01-30 12:53:49 +00:00