extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-18 05:53:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,567 Commits 32 Branches 355 Tags 224 MiB
dab4168c40
Commit Graph

602 Commits

Author SHA1 Message Date
Ralf Becker
9b093562b4 remove div.et2_container in favor of just .et2_container, as we use a from now 2015-02-04 08:35:40 +00:00
Nathan Gray
5d36da8062 Check to make sure found resource is an array instead of a column flag. 
Fixes fatal error when deleting a category.
 2015-01-27 22:43:17 +00:00
Hadi Nategh
8d0857f9bf Fix expose view in for thumbnails in resources app 
- Remove image_toolbar; image_toolbar is deprecated, and replaced by expose_view feature.
 2015-01-20 15:11:45 +00:00
Hadi Nategh
4fa44e6482 Reorder and add missing phrases in lang files 2015-01-15 14:53:34 +00:00
Nathan Gray
d51c83402d Set default columns 2015-01-12 19:59:25 +00:00
Ralf Becker
7346a37998 cleaning up old addressbook stuff 2015-01-10 09:51:51 +00:00
Nathan Gray
244e859413 More Home progress: 
- Add support for resources favorites
 2014-11-28 19:43:37 +00:00
Nathan Gray
ea8ff86854 Add a method to get an icon for a record, as specific to that record as possible 2014-11-18 23:40:49 +00:00
Nathan Gray
2f53633dca * Switch to nextmatch and edit dialog for customfield list 2014-10-22 19:55:27 +00:00
Hadi Nategh
0f9adabe4a * Resources: Avoid clicking on images on the list view to not opening images in an extra window/tab but in a tooltip popup inside the list 2014-09-29 16:34:16 +00:00
Hadi Nategh
43e0818df1 Give recources thumbnail auto height as pixelegg has fixed height and it causes to deform the image size 2014-08-27 09:12:54 +00:00
Hadi Nategh
76830f71af * Resources/list: Fix thumbnails size in resources' listview 2014-08-27 08:12:57 +00:00
Ralf Becker
94afafae11 * all apps: fixed column sizes and stretch (change when window size changes) 2014-08-22 11:08:21 +00:00
Ralf Becker
349630ffa7 show calendars and ressource-calendars for user whos preferences are displayed, for "default" and "forced" we only display all and primary group calendars, but ressources of current user 2014-07-23 12:30:39 +00:00
Ralf Becker
d6ce36d735 bump versions to 14.1 2014-06-24 10:00:50 +00:00
Nathan Gray
98ff5bbce2 Change function signatures to match importexport r47281 2014-06-16 20:10:42 +00:00
Nathan Gray
12f5a2e577 Make sure jscalendar is still loaded 2014-05-15 16:17:30 +00:00
Nathan Gray
89f045a5c1 - Fix reservation not finding any resources 
- Hide planner close button when reserving
 2014-05-15 15:59:27 +00:00
Hadi Nategh
431f0f5168 Fix gen_src radio-button not beingable to be selected in resources edit popup 2014-03-18 14:14:00 +00:00
Hadi Nategh
76f84c4378 Implement to select own_src radio-button option automatically when upload a file in resources edit popup 2014-03-18 13:38:38 +00:00
Hadi Nategh
5e6e016375 * Resources: Add new "res_creator,res_created,res_modifier and res_modified" columns to the database, and also, set their values in resources_bo 2014-03-18 09:39:30 +00:00
Hadi Nategh
bcf8bb8c07 Remove overflow from details tab in resources 2014-03-17 17:57:01 +00:00
Hadi Nategh
2dffbb22a4 Fix not arranged fields of resources in edit popup, regarding pixelegg template 2014-03-17 11:42:54 +00:00
Hadi Nategh
8e1a2d47a0 Re ordering resources edit popup template 2014-03-17 08:12:28 +00:00
Ralf Becker
3c91753e80 moving add-icon(s) from header_right to header_row 2014-03-12 10:12:29 +00:00
Ralf Becker
f0d7751496 removed caret from group favorites, fixed prefered favorite was not show correct initialy nor updated 2014-02-12 21:51:25 +00:00
Klaus Leithoff
1b95f843ec translations from Stefan 2014-02-11 09:21:30 +00:00
Hadi Nategh
70c3ab98af Set the "Allow ignore conflicts" default option to "Yes, only users with direct booking permission", therefore this would be the selected as first time installation, unless it set to another choice from Resources site configuration 2014-01-29 08:28:53 +00:00
Hadi Nategh
8147adcb95 Add "Allow ignore conflicts" feature for resources 2014-01-28 16:26:18 +00:00
Ralf Becker
0d8051837c translations from Stefan 2014-01-28 13:40:16 +00:00
Hadi Nategh
a9416b2ce9 Fix resources duplication of 'accessory of' menulist 2014-01-20 18:18:55 +00:00
Hadi Nategh
bad85f749a Missing changes for resources setup after run it in et2. Make sure that update resources in setup 2014-01-20 14:16:35 +00:00
Hadi Nategh
a71da98483 Add favorites to resources 2014-01-18 17:54:08 +00:00
Hadi Nategh
2a36bb6972 Fix resources image column 2014-01-18 17:00:16 +00:00
Ralf Becker
d2ad25a928 pixelegg changes 2014-01-17 11:53:31 +00:00
Hadi Nategh
c1322442a5 Disable history tab in resources for new entries 2014-01-17 10:52:12 +00:00
Klaus Leithoff
387035f76d new translations from translation.stylite.de 2014-01-17 10:48:19 +00:00
Ralf Becker
96e0c77fce pixelegg changes from thursday 2014-01-17 08:10:46 +00:00
Hadi Nategh
0e4ef27dd4 Remove an extra add button from resources list view. Additionally, fix category and account 2014-01-16 14:47:00 +00:00
Hadi Nategh
fd3ed8d0c0 Change Whole query action item in resources context menu to Select all 2014-01-16 14:39:05 +00:00
Hadi Nategh
2b91721887 Fix refresh after delete from edit popup in resources 2014-01-16 14:35:31 +00:00
Hadi Nategh
6a920c5e38 Replace old delete confirmation with new et2_dialog in resources edit popup 2014-01-16 14:29:05 +00:00
Hadi Nategh
0756463e96 Fix resources show rghit header template 2014-01-16 09:10:27 +00:00
Ralf Becker
7cc91b0046 new&modified images from pixelegg 2014-01-15 18:04:11 +00:00
Hadi Nategh
5197487512 Add app.js to resources 2014-01-15 15:58:09 +00:00
Hadi Nategh
7de85d97c9 Migrate Reources app from etemplate old to et2 2014-01-15 15:52:53 +00:00
Klaus Leithoff
60bb090278 pixelegg changes from wednesday, new/changed images and styles 2014-01-15 13:46:14 +00:00
Ralf Becker
629bd6f2ee added pixelegg/less/svg.css stylesheet and id reflecting their name to all svn image 2014-01-14 16:14:51 +00:00
Klaus Leithoff
e5acab5fb9 pixelegg changes from tuesday 2014-01-14 16:04:20 +00:00
Ralf Becker
21bb9ef481 pixelegg changes from monday 2014-01-14 08:20:32 +00:00
Klaus Leithoff
841afa5ba0 translations from translation server; thanks to thoose that contributed 2013-12-18 09:17:12 +00:00
Klaus Leithoff
3219eccec4 translation work provided by ingo, michael and other stylite staff 2013-12-06 08:05:58 +00:00
Klaus Leithoff
68f2605cf4 translations generated/retrieved on translation site: Thank you for your contributions 2013-12-04 10:31:41 +00:00
Ralf Becker
f8752688e0 pixelegg changes from today 2013-11-15 17:09:58 +00:00
Ralf Becker
77a30817d6 images for new Pixelegg template 2013-11-11 18:56:02 +00:00
Ralf Becker
43e1bfcc12 switching on Content-Security-Policy: script-src 'self' 'unsafe-eval' for all templates, old non-et2 apps can call egw_framework::csp_script_src_attrs('unsafe-inline') to enable inline scripts in their scope, et2 does it for CK editor which does not support CSP currently and old etemplate does it for all apps using it 2013-10-05 13:33:28 +00:00
Ralf Becker
f8a0db06fc completly remove preferences menu from sidebox and tiled preferences index in favoir of app-sensitive entries in top-menu 2013-10-03 09:23:18 +00:00
Nathan Gray
d5d977d60b Hide deleted resources from calendar sidebox list 2013-09-24 15:28:59 +00:00
Klaus Leithoff
a519fc099c commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-08-30 07:09:22 +00:00
Klaus Leithoff
cdd7fe57f5 commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-08-27 08:54:08 +00:00
Klaus Leithoff
dae7123c77 commit some lang file stuff; mostly french 2013-08-26 09:39:33 +00:00
Klaus Leithoff
95e18fd5a7 merge russian lang files provided by MBCGroup 2013-08-16 11:01:33 +00:00
Nathan Gray
cf8714293e Open preferences in preferences tab 2013-08-13 17:37:15 +00:00
Ralf Becker
38056379a2 allways return an array, easier then copying with null in various places 2013-08-01 12:59:29 +00:00
Nathan Gray
36eae09fe0 Fix custom image being lost when you're in the edit dialog and click Apply, Save or Apply, Apply 2013-07-25 15:01:41 +00:00
Klaus Leithoff
bd3e741905 wrap inline javascript with LAB to avoid runtime trouble 2013-07-20 07:53:47 +00:00
Nathan Gray
5a6ed7c407 Change history accessory_of widget to match current template 2013-07-08 21:34:02 +00:00
Nathan Gray
a9db128b70 Change custom resources icon so clicking it opens the image. Category / general icons do nothing when clicked. 2013-07-08 15:07:48 +00:00
Klaus Leithoff
079b919bbe russian translations provided by Vladimir Gavrilov (MBC-Group) 2013-06-17 12:30:44 +00:00
Klaus Leithoff
4e13e7b504 italiann translations provided by Ilias Chasapakis (webtrain.it) 2013-06-17 11:08:37 +00:00
Ralf Becker
066ffc2c25 refactored account_id change script to use information from app-specific tables_current.inc.php instead of a fixed list 2013-06-12 16:57:44 +00:00
Ralf Becker
26f9fb5cd0 remove old pre 1.8 preferences.php 2013-05-10 16:38:18 +00:00
Ralf Becker
b46770872e new German translations from Stefan 2013-02-18 15:52:43 +00:00
Ralf Becker
4e77413fe9 new english phrases 2013-02-18 15:36:57 +00:00
Ralf Becker
4f247b26f8 merged translations and other uncommited ones 2013-02-08 19:03:20 +00:00
Nathan Gray
6de7ab7faf Hide message line in edit popup when there is no message, as the other apps do it 2013-02-08 12:47:54 +00:00
Nathan Gray
087ea097b6 Default display filter to resources 2013-02-07 11:00:42 +00:00
Nathan Gray
d47c508190 Dump a missing xet file, update resource_select.xet 2013-02-05 10:19:30 +00:00
Nathan Gray
2b8826c6ad Fix export 'Use search results' 2013-01-23 18:03:00 +00:00
Nathan Gray
12e7552569 Implement export filters for resources 2013-01-22 22:44:15 +00:00
Ralf Becker
be6845b4d0 * All apps: merged missing translations from other apps or branches 2013-01-18 13:48:34 +00:00
Nathan Gray
af4bdfb18d Formatting for long description in history 2013-01-16 21:58:25 +00:00
Nathan Gray
b1484c2a1d If un-deleting an accessory but not the parent resource, un-parent and make it a resource 2013-01-15 16:50:11 +00:00
Nathan Gray
67e4e8a6cb Missed translations usable -> useable 2013-01-15 16:17:50 +00:00
Nathan Gray
eb104a9ee5 Nice handling for no read on any categories: 
- Short-cut on link query to skip search - no categories means no results
- Hide add button - with no categories, user will not be able to save
 2013-01-14 18:42:16 +00:00
Nathan Gray
b283bbfb9f Turn on delete protection by default 2013-01-14 16:57:58 +00:00
Nathan Gray
207e94e8b4 - If purging a deleted resource & promoting accessories, restore accessories too 
- Remove debug
 2013-01-14 15:38:33 +00:00
Nathan Gray
19757ba8bf Add prompt to restore accessories too when restoring (un-deleting) a resource 2013-01-09 17:20:01 +00:00
Nathan Gray
8e55f99ec2 When purging deleted resources, respect answer to accessories dialog - purge accessories too 2013-01-08 17:27:00 +00:00
Nathan Gray
7459e6ca27 If a resource has accessories, you can't change Accessory of and make it an accessory of something else - add message to template 2013-01-08 17:09:24 +00:00
Nathan Gray
9279c25b1c If a resource has accessories, you can't change Accessory of and make it an accessory of something else 2013-01-08 17:05:55 +00:00
Nathan Gray
38b6c1a500 Add fallback for accessory of links to try a match on just name, to get around the case when someone edits the CSV file and changes the short description, which is used as part of the link title 2013-01-08 15:56:48 +00:00
Nathan Gray
442c3d605e When changing a resource with accessories to an accessory, change existing accessories to resources, and give a message to the user 2013-01-07 16:21:08 +00:00
Nathan Gray
9b7da1f611 Include deleted/held accessories in change to resource 2013-01-03 16:35:02 +00:00
Nathan Gray
81a674cd8c Change delete handling to avoid purging accessories when delete+hold resources 2013-01-02 22:15:26 +00:00
Nathan Gray
5564217b0c - Hide buyable & prize fields from import|export 
- Hide customfields column if no customfields defined
- Fix export all breaks list view
 2013-01-02 17:32:30 +00:00
Nathan Gray
5b94061086 Remove buyable & price from default definitions 2012-12-31 22:12:45 +00:00
Nathan Gray
fcda447798 Delete & hold accessories when deleting a resource 2012-12-31 21:57:14 +00:00
Nathan Gray
cb84d313e8 Fix importing when accessory_of is missing 2012-12-19 20:23:40 +00:00
Nathan Gray
f25232ad32 Give deleted resources a deleted icon instead of thumbnail 2012-12-19 18:12:42 +00:00
Nathan Gray
4fce430ef9 Add missed tracking file, required before history logging works 2012-12-19 17:24:49 +00:00
Nathan Gray
1c4f15078d Fix usable vs useable. Both are right, but seems useable is more frequent in code. 2012-12-18 16:35:24 +00:00
Nathan Gray
9419fec5c6 Forgotten config template 2012-12-18 15:31:09 +00:00
Nathan Gray
a3513a9797 Add history logging & delete protection 2012-12-17 22:14:32 +00:00
Nathan Gray
72b30aaf93 Add accessory_of field to import/export & update import plugin 2012-12-17 19:03:10 +00:00
Nathan Gray
64c653f253 Remove selected accessories from checked list when deleting resource. Deleting the resource deletes all accessories, and gives an error if we try to delete it after that 2012-12-12 00:28:54 +00:00
Nathan Gray
f3f2f4d9ab Clear checked array before adding all resources - duplicates cause errors 2012-12-10 15:44:30 +00:00
Nathan Gray
9fc51055cd Use common rte preference 2012-12-06 17:14:18 +00:00
Nathan Gray
d14337da40 - Always use chosen for calendar resource select 
- Change sidebox/context add resource to always add a resource, never an accessory
- Fix link to calendar (planner) to open in calendar app/tab
 2012-12-05 19:25:32 +00:00
Nathan Gray
59c35020e7 When viewing accessories of a resource 
- Add button adds an accessory
- Allow context menu -> add accessory = add accessory to resource, _not_ selected accessory
 2012-12-04 23:57:02 +00:00
Nathan Gray
e765fda60e Fix preset resource catagory from nextmatch 2012-12-04 23:42:56 +00:00
Nathan Gray
5aaaca3c81 - Disable custom tab if there are no cfs defined 
- Use link_title for resource accessories in list
- Pre-set category according to list filter or parent resource
 2012-12-03 20:20:42 +00:00
Nathan Gray
f5a4fa694c Remove debug 2012-11-27 18:10:55 +00:00
Nathan Gray
0fd3388221 Handle delete selection more intelligently, handling mixed selection of accessories and resources 2012-11-27 18:08:13 +00:00
Nathan Gray
a821b7a567 - Fix apply button clearing new resources 
- Fix deleting accessories not actually removing them
 2012-11-27 16:47:12 +00:00
Nathan Gray
147b926490 - Remove 'Add accessory button' 
- Fix bug in delete confirm
- Fix link url
 2012-11-26 21:04:31 +00:00
Nathan Gray
4b4308dcff Add missing accessory of selectbox, re-order context menu items 2012-11-20 21:30:35 +00:00
Nathan Gray
0f1b273cb1 - Add accessory of selectbox to move accessories between resources 
- Remove 'back' button, viewing accessories of a resource now uses nm filter entirely
- Remove view, using read-only edit
 2012-11-14 18:00:02 +00:00
Nathan Gray
052897fcd8 - Add display filter to view resources, accessories, or both 
- Change view accessories activity to depend on the existance of accessories in DB, not links
- Add view accessories action to context menu
 2012-11-13 17:26:31 +00:00
Nathan Gray
78011ed719 Ask what to do with accessories when deleting a resource 2012-11-06 23:17:26 +00:00
Nathan Gray
cc975d4c0d Update default definitions to include storage info, expect column Usable 2012-10-10 19:09:57 +00:00
Nathan Gray
3cd94c9557 Remove double conditions from default import definitions 2012-10-09 16:27:01 +00:00
Ralf Becker
e913a6a263 pending translations from translation.stylite.de 2012-08-08 12:11:04 +00:00
Nathan Gray
5ae2ad4964 Update default importexport definitions to use human values 2012-05-15 23:31:17 +00:00
Nathan Gray
a4b71c7d3a Fix 12 hour afternoons 2012-05-03 02:15:35 +00:00
Nathan Gray
ab63063023 Restrict times to working hours, from calendar 2012-05-03 02:11:36 +00:00
Klaus Leithoff
2f4a486c10 * resources: fix for missing/not loaded pictures for resources in default/images/resource_icons/ 2012-04-24 06:56:43 +00:00
Nathan Gray
62a98e50be Allow to include an extra group in event participants 2012-04-12 23:04:49 +00:00
Nathan Gray
340628e721 Use sitemgr user's default appointment duration for booking time blocks 2012-04-12 22:20:21 +00:00
Nathan Gray
4aa875b885 Avoid warning on missing accessories 2012-04-12 22:18:22 +00:00
Klaus Leithoff
13a217d815 * resources: fix broken import when importing with human readable names (not database values) 2012-04-04 11:58:05 +00:00
Ralf Becker
11d39d7edd testing trailing whitespace commits 2012-04-04 09:46:17 +00:00
Ralf Becker
0d3d77c76c add locations category required for CalDAV to distinguish between locations and resources, when updating from 1.8 2012-03-31 09:34:45 +00:00
Nathan Gray
83c3cee10d Use standard app.class.method format 2012-03-30 21:06:16 +00:00
Ralf Becker
ee8fd5b10e found a lot more calls to get_rows missing to set csv_export flag and fixed code in nextmatch dealing with situation if num_rows=-1 got stored in prefs anyway 2012-03-29 12:06:10 +00:00
Klaus Leithoff
cbcefbeb1f change add - submit button to button. (has no autofocus) 2012-03-06 16:06:57 +00:00
Nathan Gray
b126ccf8c3 Initialize accessory list array 2012-02-28 20:24:37 +00:00
Ralf Becker
3dadc207af fixed typo and added translation for new context-menu items 2012-02-22 12:48:02 +00:00
Nathan Gray
90ccc3f8fc Sitemgr reservations - Add confirmed addressbook option to move confirmed contacts 2012-02-14 21:01:03 +00:00
Nathan Gray
59b277ec5f A new sitemgr module for public reservation of one specified resource. Uses an emailed confirmation link to confirm the reservation 2012-02-11 00:47:54 +00:00
Klaus Leithoff
ba9c778c68 fix for missing groups in acl-account-list for write / cal-read / booking 2012-01-24 12:20:29 +00:00
Klaus Leithoff
77e38999c4 * resources: change / introduce sorting for display of Account/Group List in ACL management; in addition groups are now sorted to the end of the list 2012-01-24 11:41:26 +00:00
Klaus Leithoff
53d5c88c14 check, that a possible col_filter is not overwritten by possible customfield col filters 2012-01-23 13:54:44 +00:00
Ralf Becker
11e6879aac * Calendar/Resources: do NOT unselect currently selected calendars when selecting a resource category, eg. to choose a meeting room 2012-01-09 21:26:41 +00:00
Nathan Gray
f6a443a917 Add warnings to import plugin 2011-12-15 16:24:47 +00:00
Ralf Becker
7c9dd8086f changed "No defintion" to "Old fixed definition" 2011-11-21 10:01:08 +00:00
Nathan Gray
1afba81ce8 Add 'No definition' option for default export definition preference. Allows use of legacy nextmatch CSV export with Import/Export app still available 2011-11-18 16:01:57 +00:00
Ralf Becker
bca8179821 added some caching to not read resources multiple times from the database, specially in listing them, dont query db for every row multiple times 2011-10-14 08:36:12 +00:00
Ralf Becker
01e92100c4 ability to mark resource-categories to be used for locations or rooms, destinction is required for CalDAV 2011-10-13 06:21:46 +00:00
Klaus Leithoff
0d78091fe5 * resources/sitemanager integration: fixed broken resources sitemanager integration 2011-08-22 11:12:30 +00:00