extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 08:53:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,415 Commits 32 Branches 355 Tags 194 MiB
a717ab2b59
Commit Graph

1473 Commits

Author SHA1 Message Date
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
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
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
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
Ralf Becker
25c3624caa ignore acl only for admins 2011-06-24 14:22:15 +00:00
Ralf Becker
e960b79570 fixed not working access to all non-private user categories (ACL was priviously allways taken into account) 2011-06-24 13:35:39 +00:00
Oscar Manuel Gómez Senovilla
164871ec02 Update Czech translation for trunk. Tracker #2886 2011-06-23 13:53:19 +00:00
Nathan Gray
3d09b732e3 Fix All categories / Global categories filter 2011-06-22 21:17:16 +00:00
Nathan Gray
94d0b7c780 Fix filter for private, now only shown to owning user with 'Own categories' 2011-06-22 20:58:53 +00:00
Nathan Gray
d15e738692 Fix filter for personal categories under a global category 2011-06-22 20:45:42 +00:00
Nathan Gray
a9cd9ed96d Restore 'All categories' for preferences 2011-06-22 19:59:22 +00:00
Nathan Gray
a7bccd968c Admins can't edit global categories if they're not in Admin app 2011-06-22 19:54:41 +00:00
Nathan Gray
0aa3d448a6 Make name required field 2011-06-22 19:45:36 +00:00
Nathan Gray
e4737a38a5 Fix child rows displayed multiple times 2011-06-22 19:40:35 +00:00
Nathan Gray
5424423f49 - Use separate session storage for each app 
- Disable filter for Admin -> Global categories, there can't be personal categories there
 2011-06-22 19:23:31 +00:00
Nathan Gray
1a7f460628 If admin edits a (private) category, it will now become public 2011-06-22 19:03:21 +00:00
Nathan Gray
bef50c4dbc - Fix re-setting filter - set private to readonly if not in admin section, and user is not category owner 2011-06-22 19:01:00 +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
d9b12fd8ab Make sure default filter is always properly set 2011-06-21 21:30:26 +00:00
Nathan Gray
a555588dbe Use the same code for categories for preferences & admin, add context menu 2011-06-21 20:14:56 +00:00
Nathan Gray
c2e3ddafc1 Make category owner required 2011-06-16 15:54:19 +00:00
Nathan Gray
1ab285100a - Only show user to user, admins pick from groups 
- Don't allow empty owner, use 0 if empty
 2011-06-16 15:51:42 +00:00
Nathan Gray
3d9a9fc9de Add filters for global / user to categories list 2011-06-15 22:27:40 +00:00
Nathan Gray
81f58ab129 - Change category group filtering to allow multiple groups 
- Give warning when removing access from a group
 2011-06-14 18:50:35 +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
Ralf Becker
d12475ec9e some fixes for the English translation, from our Suomi resident here as Stylite 2011-06-09 06:57:25 +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
1821e03ef9 trying something relative 2011-06-06 14:14:11 +00:00
Ralf Becker
e13ce83df0 a little more ... 2011-06-06 14:06:03 +00:00
Ralf Becker
7e036516ef a little nicer admin and prefs index page 2011-06-03 16:40:33 +00:00
Ralf Becker
e09444e4f6 - fixed silently not working statistic submit with Webkit browsers (Safari, Chrome, ...) 
- changed submit url to https://www.egroupware.org/usage-statistic to overcome unsecure submit warnings
 2011-05-31 09:25:36 +00:00
Klaus Leithoff
0b1e444325 do not use password on asetLastPwdChange in admin actions, as the use of passwords indicates the usage of the functionality in usermode; Handle params for egw_cache::getSession in the correct order 2011-05-19 10:32:46 +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
ab63660111 Use default conversions, don't pass account_lid to create new groups 2011-04-26 14:43:57 +00:00
Ralf Becker
5495491e78 * Admin: session-list is generated now from egw_access_log table independent of readablity of sessions files in filesystem 
- session_(dla|action) is stored in egw_access_log table
- notifications refresh via ajax set notification_heartbeat timestamp in egw_access_log
- if notification_heartbeat is set (happens only for browser sessions with popup notification) sessions get removed from session list one minute after browser is closed
- new static method egw_session::notifications_active($account_id) to check if given user has an open browser with notifications popup checking, to ensure popup notifications can fall back to email
--> REQUIRES DATABASE UPDATE / SETUP
 2011-04-13 14:11:09 +00:00
Klaus Leithoff
5d41f54594 * Admin: fix for reported error regarding wrong count of lines in Admin -> view error log (note, not all errors are logged there, only some. Its only used for some error logging, most of error logging is done/directed to the webservers error log) 2011-04-13 10:07:42 +00:00
Nathan Gray
50296c519a Fix import / export available and exported fields 2011-04-12 22:23:40 +00:00
Nathan Gray
64e2ada353 Add export plugins for users and groups 2011-04-12 15:38:27 +00:00
Ralf Becker
cec35e75d8 moved notify users via mail into action groupbox 2011-04-05 15:05:01 +00:00
Ralf Becker
b91ffb709c moved notify users via mail into action groupbox 2011-04-05 15:02:41 +00:00
Ralf Becker
972eb515c3 added "must change password" and "can change password" attribute to "Bulk password reset" command and added German translation 2011-04-01 18:49:42 +00:00
Ralf Becker
bab48aee0a * method to reset passwords of multiple users to a random password and notify them about that, also allows to change from plaintext passwords to a different hash 2011-04-01 13:35:16 +00:00
Ralf Becker
c801bdf99e identical lettersearch for etemplate and admin via central css file 2011-03-30 08:18:06 +00:00
Ralf Becker
4039fdf415 * give everyone implicit rights for home app, as taking them away makes to many support problems 2011-03-30 07:54:29 +00:00
Ralf Becker
e40974e360 using new list styles and remove some not used templates 2011-03-27 17:16:35 +00:00