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

67 Commits

Author SHA1 Message Date
Ralf Becker
b5b6784ec1 * Admin/PostgreSQL: shorten ACL labels used to limit admin rights to 16 char and fixed stalled 14.3 update for PostgreSQL 2015-08-04 09:55:29 +00:00
Nathan Gray
577c4afaef Fix add category button 2015-03-23 18:57:33 +00:00
Hadi Nategh
a9522e71cd Fix user can not delete its own categories from nextmatch context menu 2015-02-11 09:40:01 +00:00
Nathan Gray
fd0b513bbb Keep appname through actions, fixes blank after action 2015-01-27 22:41:13 +00:00
Ralf Becker
3093cb6b85 fixed not working refresh of user category list called via top-menu after adding/editing a category 2014-09-25 16:03:28 +00:00
Hadi Nategh
16c5a62ed4 Use similar Global category's delete confirmation dialog as it is used in edit popup too 2014-07-15 09:52:00 +00:00
Hadi Nategh
2e2d48ff1f Disable "Change Owner" item from category context menu if it is a private one 2014-07-14 13:30:26 +00:00
Hadi Nategh
025f31872f Fix delete confirmation dialog in Global categories edit popup 2014-07-14 10:19:32 +00:00
Hadi Nategh
49789bcf09 Fix Gloabl categories owner_popup actions 2014-07-11 09:47:43 +00:00
Hadi Nategh
609e909eef Make sure the content[owner] is an array because lisbox widget expects to receive an array 2014-06-30 08:59:19 +00:00
Nathan Gray
c983e02c9e Send category sel_options each time to fix category colors not being updated. 
Use update types to refresh just the changed row or whole nextmatch contents, as needed.
 2014-03-05 17:33:42 +00:00
Nathan Gray
b8bf2f7b2d Don't set icon_url if icon is not set. 
Fixes browser displaying missing image if Icon = 'none'
 2014-01-20 14:25:18 +00:00
Nathan Gray
f9b34a4c56 Fix save does not close category popup 2013-12-16 20:11:58 +00:00
Nathan Gray
4f46394b71 Need to update opener before closing the window, or it won't work... 2013-12-10 22:38:36 +00:00
Nathan Gray
de840c2d7d The category template starts with 'admin', so we refresh admin or etemplate2 won't find it. 2013-12-10 22:23:05 +00:00
Nathan Gray
7c33488596 More changes to get category list working using etemplate2 2013-12-10 00:03:36 +00:00
Nathan Gray
e008bd63bb Change categories to use et2 2013-12-04 21:51:20 +00:00
Nathan Gray
237c5ffcdf Fix missing category colors for app specific categories 2013-03-15 14:49:02 +00:00
Nathan Gray
2218fd8956 Fix category search missing when result is a child, but parent does not match too 2012-11-05 17:56:03 +00:00
Nathan Gray
f8fbafd086 Fix typeOptions to get appname in the right place 2012-05-29 15:23:12 +00:00
Nathan Gray
bdbd2af3e8 Send category information for colored rows in et2 2012-05-22 19:53:58 +00:00
Nathan Gray
ebdc207ff5 Apply no_acl_check to global categories too 2012-04-16 16:37:18 +00:00
Nathan Gray
2bb445453e Fix missing parent category when adding a child when parent has acl 2012-04-11 16:58:30 +00:00
Nathan Gray
c4b2fd4a64 Default owner to same as parent category when adding a child category 2012-04-05 18:33:49 +00:00
Ralf Becker
9954e7b42e Show icon based on icon-selectbox, hide placeholder (broken image), if no icon selected 2012-04-05 12:32:07 +00:00
Nathan Gray
2d6569414b - Allow adding a child category to a restricted category 
- Show filter for application global categories
 2012-04-02 16:29:13 +00:00
Ralf Becker
0b3f4a04f0 switch filter (all|global|own) and access column off for all global categories 2012-02-15 10:25:41 +00:00
Ralf Becker
0d5d839b30 fixed app >> categories filter "all" to contain private categories too, also added a private column for easier identification 2012-02-15 09:40:05 +00:00
Nathan Gray
2b76256ecf Fix typo causing all added categories to be global 2011-11-03 14:37:43 +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
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
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
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