extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-30 20:04:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,666 Commits 32 Branches 356 Tags 197 MiB
5e44c30553
Commit Graph

1183 Commits

Author SHA1 Message Date
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
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
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
9d0e1e4590 fixed PHP Warning: array_key_exists(): The first argument should be either a string or an integer 2011-07-02 09:10:02 +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
Christian Binder
f174acb6d7 Projectmanager merge class now resolves its own project fields. Infologs can be assigned to eRoles now to resolve infolog fields in document merge. New ability to declare eRoles as -multi- in GUI. This will give us the ability to create a whole list of contents in a document with just one eRole given (not yet implemented). 2011-01-29 11:55:42 +00:00
Christian Binder
02966ff811 applied signature change of get_replacements method also to new infolog_merge 2011-01-27 17:39:32 +00:00
Nathan Gray
116523ccfd Add merge functionallity to infolog 2011-01-26 20:16:18 +00:00
Nathan Gray
e2baa8ab1d Add default import/export definitions 2011-01-26 00:12:19 +00:00
Klaus Leithoff
1abcbb12fc * eMail: fix stripping too much text, extended: apply solution of r33526 to infolog and tracker, when mail is converted while/after sending 2011-01-20 12:24:34 +00:00
Klaus Leithoff
d39b9f3594 * infolog: feature to be able to control max-width of description area in list-view 2011-01-05 15:45:27 +00:00
Nathan Gray
bb01196183 Check to make sure rows is set before trying to unset a sub-index 2010-12-20 22:27:33 +00:00
Nathan Gray
746d48d5af Unset checked entries when no longer needed, they can cause problems with other actions (delete) later 2010-12-20 18:16:34 +00:00
Nathan Gray
059395d1e0 Implode arrays when not exporting human-friendly values so they don't say 'Array' 2010-12-10 22:48:59 +00:00