holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,332 Commits 27 Branches 330 Tags 157 MiB
abe6ce3482
Commit Graph

1497 Commits

Author SHA1 Message Date
Nathan Gray
abe6ce3482 Fix bug in condition matching on account ID, if account ID is not in file 2012-01-25 17:31:57 +00:00
Nathan Gray
7f866bdf8e Copy existing group info, needed for accounts->save() 2012-01-19 19:44:33 +00:00
Nathan Gray
f6a443a917 Add warnings to import plugin 2011-12-15 16:24:47 +00:00
Ralf Becker
965b381a92 translations for "Custom translation" 2011-11-17 13:01:16 +00:00
Ralf Becker
f2d7c5c6c3 * Custom / instance-specific translations, eg. to rename an application 2011-11-17 12:43:59 +00:00
Nathan Gray
2b76256ecf Fix typo causing all added categories to be global 2011-11-03 14:37:43 +00:00
Klaus Leithoff
cc01eda69f try to set a logical default for ->can change passwords<- for new accounts. true if you force users to change passwords every x days, false if not 2011-10-06 15:46:43 +00:00
Ralf Becker
fc1b7cff3c fixed not shown navbar in configuration 2011-09-13 08:21:25 +00:00
Ralf Becker
64393ce7a2 calling framework->render() after parsing the template, to allow callbacks to register javascript files 2011-09-04 15:25:53 +00:00
Ralf Becker
54bf7a3d2d - fixed image map was empty created when not loged in (now directories are used and not $GLOBALS['egw_info']['apps']) 
- fixed not working vfs-image-dir
- deleteing image-maps when:
  + apps get installed, updated or removed
  + admin >> register hooks
  + admin >> site configuration: vfs-image-dir get changed
- fixed not displayed validation errors (thought there were no validation) in admin >> site config
--> you need to register hooks, in order to get the admin >> site configuration validation hook ;-)
 2011-08-31 10:16:12 +00:00
Ralf Becker
7cbff78854 config for export limit excepted users/groups, need backend work from nathan 2011-08-17 09:36:51 +00:00
Ralf Becker
495632fc40 removed not used file 2011-08-17 09:32:55 +00:00
Ralf Becker
17a41103d5 Loa language translation from vimontha <kvimontha@yahoo.com> 2011-08-09 06:12:25 +00:00
Ralf Becker
39fd95dbcc fixed not working edit of categories using legacy icon 2011-08-03 14:08:43 +00:00
Ralf Becker
1043425e36 fix problem reported by Fabio Ciuffani / John Leitch <john@autosectools.com> 2011-08-03 07:17:15 +00:00
Klaus Leithoff
11475a41cd * admin: allow to choose which kind of spellchecking you would like to employ when using the CK Editor (Options now: Yes, No, Without SpellCheckAsYouType, WebSpellChecker) 2011-08-02 11:39:59 +00:00
Nathan Gray
a24606739e Fix category list action buttons 2011-07-13 16:39:36 +00:00
Nathan Gray
765f486753 Can't edit a category that's not from the current app - open super-globals read-only 2011-07-07 18:54:59 +00:00
Nathan Gray
52f3dd9ed2 Use a different method of filtering out global categories 2011-07-07 18:34:33 +00:00
Nathan Gray
283a2a01ff Change how app filter works: 
- Only list All and current app
- All shows app + globals, app shows just app categories
- App filter hidden when editing super globals
 2011-07-07 17:19:04 +00:00
Nathan Gray
4515f24b85 - Clear owner popup after use 
- Remove user if adding group to user category
 2011-07-06 15:10:46 +00:00
Nathan Gray
d7372d5a60 Add app filter to category list 2011-07-06 14:44:23 +00:00
Nathan Gray
5740888427 - Add a hint/warning when admin edits user's category to change owner 
- Change 'Change owner' to use add/remove, similar to other apps
 2011-07-05 16:35:32 +00:00
Nathan Gray
3ac3cfeb24 Add 'Change owner' to category context menu 2011-07-04 21:16:44 +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
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