extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,760 Commits 33 Branches 357 Tags 204 MiB
6c160cd3b1
Commit Graph

228 Commits

Author SHA1 Message Date
Nathan Gray
4aebbb187e If field is not in the list of fields to be imported, do not add it in as null - could overwrite existing data 2012-04-25 14:21:19 +00:00
Nathan Gray
aa9687e6b5 Fixes for scheduled exporting 2012-04-24 16:06:31 +00:00
Nathan Gray
8d8a80c26a Fix human values in infolog export 2012-04-24 14:04:09 +00:00
Ralf Becker
e8377f28cf More rigorous checking on empty / missing date - set to null, not blank 2012-04-13 08:27:40 +00:00
Nathan Gray
c87887d11f Change addressbook Export CSV context menu option to use importexport 2012-04-02 16:35:03 +00:00
Nathan Gray
0a9a1736ca Change error output from STDERR to error_log 2012-04-02 14:37:14 +00:00
Ralf Becker
f609efbdd8 * ImportExport/Tracker: timeout left num-rows set to -1, causing nextmatch to try to display full list on next login 2012-03-29 10:45:08 +00:00
Ralf Becker
9319cfd8c4 trying to work arround "PHP Fatal error: Cannot unset string offsets in /usr/share/egroupware/importexport/inc/class.importexport_schedule_ui.inc.php on line 444" 2012-03-13 10:23:59 +00:00
Nathan Gray
e973f8dd0e Log the format attempted 
r38201: Give a warning if imported type is not valid
r38218: Add current record to the end of errors / warnings
r38244: Make warning about missing type into error
 2012-03-06 15:54:34 +00:00
Nathan Gray
5c843ed783 Reset warnings before starting import 
r38035: - Fix sorting by modification time to handle files changed at the same time
- Catch exceptions for logging
r38036: Lock import/export job while running, to prevent multiple instances.
 2012-02-17 20:19:31 +00:00
Nathan Gray
b537ac9d81 Fix import CSV date/times to correctly handle differences in user time 2012-02-08 16:47:46 +00:00
Nathan Gray
a18c32c824 Record run time of scheduled job 2012-02-02 17:16:55 +00:00
Nathan Gray
820d9dca0c - When converting account names to IDs, remove successful conversions so user can be warned about unsuccessful ones 
- Return warnings from conversion
 2012-01-26 15:32:13 +00:00
Nathan Gray
8253598419 Stop double encoding on export file header 2012-01-10 19:46:09 +00:00
Nathan Gray
0a11e30692 Refresh opening window after importing 2012-01-09 20:53:06 +00:00
Nathan Gray
09a512c085 Filter definitions by selected application / plugin 2012-01-04 15:58:51 +00:00
Nathan Gray
6256a143c7 * Add data preview to import test mode 2011-12-23 16:37:38 +00:00
Nathan Gray
0054184aaf * Scheduled import improvements: 
- Importing from a remote url over HTTP
- Better display of results in schedule list
- Notification of warnings / errors via notification system
- Import all files in a directory
- Option to delete file(s) after import
 2011-12-20 15:45:16 +00:00
Nathan Gray
1f077f91d0 Remove comma from exported date/times 2011-12-19 22:48:03 +00:00
Nathan Gray
360d45b2f1 Fix scheduled import from remote url 2011-12-16 15:54:02 +00:00
Nathan Gray
2a3db54693 Preserve original field names when creating an export definition from an import definition 2011-12-15 15:37:41 +00:00
Klaus Leithoff
c066acfa5c use wizard to try to translate headers. it should give better results, especially with compounds like ->street (business)<-, where translation has no such phrase 2011-12-14 11:02:55 +00:00
Nathan Gray
fd57cd738c Take field translations from wizard, if available, otherwise leave them alone 2011-12-12 18:11:11 +00:00
Nathan Gray
e272848444 - Fix broken encodings by using export_csv's fputcsv 
- Include set charset in HTTP header
 2011-12-09 21:08:48 +00:00
Nathan Gray
acffb97eb1 Add CP850 to charset list, add configuration option for other available charsets 2011-12-08 16:08:36 +00:00
Nathan Gray
e4c4ce3d45 fixing an php5.2.x error for ::export... to ->export... - we dont need the static call here anyhow. 2011-12-05 16:14:21 +00:00
Nathan Gray
6032b48c82 * Add ability to create an export definition based on an existing import definition 2011-12-05 16:07:40 +00:00
Nathan Gray
5898109a41 Use PHP's native fputcsv, doesn't appear to cause problems 2011-12-05 15:56:55 +00:00
Nathan Gray
f57b01dd42 Do charset conversion once per line instead of on each field 2011-12-05 15:49:56 +00:00
Ralf Becker
77647a9d31 only check for class.$classname.inc.php files, when scanning for plugins, as backupfiles postfixing the filename with an other extension stall EGroupware completly (Fatal Error: Can not redeclar class) 2011-11-21 09:51:15 +00:00
Nathan Gray
fe7dddcc0d * Add ability for user to change import/export delimiter when importing / exporting 2011-11-14 16:27:34 +00:00
Nathan Gray
afe5a510db Fix disappearing conditions 2011-11-08 15:55:11 +00:00
Nathan Gray
9e2e0e878c Fix error when selecting multiple users/groups for definition sharing 2011-11-03 14:20:13 +00:00
Nathan Gray
de6cf8100b Make wizard read-only if user has access to the definition, but is not the owner 2011-10-27 14:14:29 +00:00
Nathan Gray
eb924b13cd Add convert option, affects how date/times & categories are parsed 2011-10-26 17:46:11 +00:00
Klaus Leithoff
55dbf20c33 * calendar/addressbook/importexport/merge-print: introduction of a static function to fetch the export limit, and normalize the possible output: bo_merge::getExportLimit; apply new function to bo_mergen, nextmatch_widget, addressbook, calendar and importexport; introduction of an calendar export limit; introduction of hook to provide appspecific export_limit 2011-09-16 13:23:15 +00:00
Klaus Leithoff
a3b17caa5f * impportexport/document merge: better control of exportlimits, you are now able to exempt groups or users from any exportlimits set (backport of nathans work, with enhancements from ralf) 2011-09-01 14:32:26 +00:00
Nathan Gray
3059bca527 Use similar_text() to try to automatically match import field names to application fields when there's no exact match 2011-08-10 16:09:19 +00:00
Nathan Gray
a717ab2b59 Send admin or preferences as application, depending on current location 2011-07-06 14:13:09 +00:00
Nathan Gray
731cdbec51 Enable import CSV plugin, but remove default definition. Admin can create it if needed 2011-07-04 15:09:35 +00:00
Ralf Becker
9db4fa8625 * 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:12:55 +00:00
Nathan Gray
fe05c1cb03 Change selectbox back after 2011-06-28 15:52:26 +00:00
Nathan Gray
203fb83f0d Don't try to select all if the current search filters give no results, give an alert to select something 2011-06-27 17:23:59 +00:00
Nathan Gray
039e351d8b 'Disable' Export & merge spreadsheet in sidebox for addressbook view 2011-06-22 18:14:52 +00:00
Nathan Gray
615ea171c2 If automatically using 'select all', turn it back off again after merge 2011-06-20 16:36:51 +00:00
Ralf Becker
8e53f21349 using bo_merge::get_documents to get export documents 2011-06-17 14:07:10 +00:00
Nathan Gray
768859718f Update selection tab if definition is changed. 2011-06-09 14:42:58 +00:00
Nathan Gray
483069d970 Use nextmatch preferred definition as pre-selected export definition 2011-06-08 15:01:27 +00:00
Nathan Gray
7ee8739394 For calendar & sitemgr, use labels 'Import' & 'Export' instead of 'Import CSV' & 'Export CSV' 2011-06-08 14:55:25 +00:00
Ralf Becker
469f938967 consider running in setup (install/update of app) as run by an admin 2011-06-08 10:59:45 +00:00