extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-07 02:22:56 +02:00
Code Issues Packages Projects Releases Wiki Activity
17,401 Commits 30 Branches 353 Tags 214 MiB
03e379e570
Commit Graph

17401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a7aef6a4da fixed egroupware.org bug #3002: PHP Warning: mb_strpos() in class.egw_session.inc.php on line 1081 2011-07-03 06:54:32 +00:00
Ralf Becker
a89430ae8e fixed multiline fields in notification message were all in one line 2011-07-02 09:36:21 +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
a5fc76490c fix egw_cache perms evtl. created by root, stoping webserver from accessing it 2011-07-01 19:22:18 +00:00
Ralf Becker
d36005eb3a not used since a few years 2011-07-01 19:10:43 +00:00
Ralf Becker
70b84e372c fixed catchable fatal error: param 2 to egw_vfs::propatch() must be an array 2011-07-01 14:24:22 +00:00
Ralf Becker
c13c463143 Using cal_modified as deleted-timestamp, as querying it from SyncML tables creates too many problems (refresh table stops before copying all rows!) 2011-07-01 08:30:51 +00:00
Ralf Becker
e45589feea ask only a single time for multiple files and break on other errors, as they reset the selected files anyway 2011-07-01 08:08:34 +00:00
Ralf Becker
ac78b77180 support for html5 multiple upload in file-exists check 2011-07-01 07:49:58 +00:00
Ralf Becker
9f94f1f8e3 support for html5 multiple upload 2011-07-01 07:48:06 +00:00
Ralf Becker
25b81ce4da install/upgrade required PEAR packages on install/upgrade of EGroupware package 2011-06-30 20:59:57 +00:00
Ralf Becker
99c18003a4 install/upgrade required PEAR packages on install/upgrade of EGroupware package 2011-06-30 20:56:20 +00:00
Ralf Becker
548ae17b66 fixed error in link-entry: " has an invalid format !!!, after adding html5 type attr to text/input widget 2011-06-30 17:57:55 +00:00
Ralf Becker
d654437a54 - allow confirmation only for multiple selected 
- confirm, confirm_multiple and allowOnMultiple get now inherited by children (@Andreas: allowOnMultiple does NOT work on children for some reason)
- add confirmation for more then one receipient in mail merge
- translations for etemplate part
 2011-06-30 17:35:52 +00:00
Ralf Becker
95bbacf358 mime icon for eml - message/rfc822 2011-06-30 16:36:14 +00:00
Klaus Leithoff
b30fcc52f3 allow merge_print for emails on all applications (only one entry at a time, exept addressbook); addressbook merge_print with an email of one contact, the mail is stored with the draft folder and then opens the compose dialog, if used on multiple contacts, we try to send them right away. Better control of SigOnTop Handling. 2011-06-30 15:28:29 +00:00
Ralf Becker
3f6fcf60d2 support for some html5 form features, if browser supports it 2011-06-30 15:19:08 +00:00
Ralf Becker
d9e452ce52 context menu for filemanager 2011-06-30 13:07:55 +00:00
Ralf Becker
9b26f95798 consolidating icons 2011-06-30 13:01:03 +00:00
Ralf Becker
be57f2a37b new standard action to active the first link in a row, fixed numeric id's det Del shortcut 2011-06-30 12:43:04 +00:00
Klaus Leithoff
51c6e79475 allow email - merge print only for addressbook (by now); handle mergeprint for accounts stored with ldap as well 2011-06-30 11:21:48 +00:00
Ralf Becker
8e8aba371e reverted r35561, as it breaks popups in other apps 2011-06-30 10:06:31 +00:00
Klaus Leithoff
aa706d8cb8 * eMail: feature to use merge_print on emails for sending previously prepared (and stored) emails to contacts. The email address is used as To address. If no email address is specified, email_home is used. Addressbook replacements are performed on text/html body and subject; BugFix regarding problems with styledefinitions containing umlauts 2011-06-30 09:47:29 +00:00
Nathan Gray
4550cb3171 Fix links so they open in correct app window with jdots 2011-06-29 16:39:23 +00:00
Nathan Gray
f736c89bbf Prevent doubling webserver url when building a link 2011-06-29 16:35:24 +00:00
Ralf Becker
e2b385ed9c new setup command (object) to register all hooks and adding it to setup-cli.php 2011-06-29 08:40:24 +00:00
Ralf Becker
37ec659a8f quitend warning 2011-06-29 07:21:56 +00:00
Ralf Becker
5e05030629 fixed attachments lost when converting email to infolog, is_uploaded_file check in egw_vfs::copy_uploaded need to be switched off (plus improved logging) 2011-06-29 07:00:09 +00:00
Ralf Becker
05a3ccb320 dont load cfs for template from stylite app 2011-06-28 20:47:35 +00:00
Ralf Becker
bd7407ed88 - fixed bug in egw_vfs::check_access for a user different from current one: need to clear the stat-cache after the call too, as the next call might be the regular user again! 
- new method egw_vfs::copy_uploaded() to copy a file into vfs and set properties (eg. the comment), while treating the whole operation notification-wise atomar (one notification about an added file).
- using that method for egw_link too
- fixed egw_link not displaying comments
 2011-06-28 20:43:47 +00:00
Ralf Becker
e6470f6b58 some more debug stuff, switched off by default 2011-06-28 17:20:19 +00:00
Ralf Becker
0ed8be96b5 fixed "jumping" (different hight) tabs 2011-06-28 16:22:04 +00:00
Nathan Gray
fe05c1cb03 Change selectbox back after 2011-06-28 15:52:26 +00:00
Ralf Becker
9cb94fc0cf fixed warning: missing argument 3 2011-06-28 13:47:16 +00:00
Ralf Becker
27edf73e34 upload icon from KDE Tango theme 2011-06-28 07:03:07 +00:00
Nathan Gray
426dff7f9c If value is something that evaluates to false, display nothing ('') 2011-06-27 22:14:44 +00:00
Nathan Gray
387f4ed073 Some fixes for category access with multiple owners 2011-06-27 22:05:03 +00:00
Nathan Gray
3b3850eb22 Change owner selectbox back to single selection until all the backend stuff gets tested 2011-06-27 21:14:25 +00:00
Nathan Gray
9a9323e37d If an admin edits a user's category, it becomes a global category. 2011-06-27 20:44:43 +00:00
Ralf Becker
57215ec67c fixed not working debug message 2011-06-27 20:00:05 +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
1500c4f739 Fix warning message again 2011-06-27 15:54:07 +00:00
Nathan Gray
ca227eda32 Missed template & lang changes for previous commit - changed access warning message, changed phpgw to Global in app list 2011-06-27 15:51:31 +00:00
Nathan Gray
00cbf4b6fb - Use full warning message for translation 
- Rename phpgw to Global in app list
 2011-06-27 15:49:42 +00:00
Ralf Becker
b093cd8720 missing $contact_app parameter, stalling grants 2011-06-27 15:30:56 +00:00
Nathan Gray
80c4d0d5c6 Fix owner selection: 
- Make user's categories readonly in admin
- Fix display of group categories in preferences
 2011-06-27 14:44:27 +00:00
Nathan Gray
fe7e8ef9ac Don't warn about losing access for a new category 2011-06-27 14:34:40 +00:00
Nathan Gray
ec158c5e5c Fix global filter excluding global cats limited to groups 2011-06-27 14:28:13 +00:00
Klaus Leithoff
ad933f60c9 fix bug in notifications introduced with rev35400 2011-06-27 09:09:17 +00:00