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 |
|
Ralf Becker
|
17a41103d5
|
Loa language translation from vimontha <kvimontha@yahoo.com>
|
2011-08-09 06:12:25 +00:00 |
|
Klaus Leithoff
|
356d4b0db6
|
fix fatal error: unsupported operand type in resources_ui line 428; reported on community tracker#3006
|
2011-07-08 07:47:45 +00:00 |
|
Nathan Gray
|
31d1e20bdc
|
Fix typo: definitition -> definition
|
2011-07-04 20:00:26 +00:00 |
|
Oscar Manuel Gómez Senovilla
|
164871ec02
|
Update Czech translation for trunk. Tracker #2886
|
2011-06-23 13:53:19 +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
|
275a1d3f27
|
Change category list links
|
2011-06-21 21:14:51 +00:00 |
|
Ralf Becker
|
8e7c73dd84
|
some fixes for English and Suomi translation, from our Suomi resident here as Stylite
|
2011-06-16 13:01:29 +00:00 |
|
Ralf Becker
|
07972fc074
|
fixed not set group causing Open action to be displayed below all other actions
|
2011-06-11 11:12:39 +00:00 |
|
Nathan Gray
|
8abc20badf
|
Order link search results by name
|
2011-06-10 14:20:47 +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 |
|
Nathan Gray
|
27572ba4cf
|
Move select all to above view calendar
|
2011-06-09 14:07:22 +00:00 |
|
Nathan Gray
|
71232c0ad5
|
No longer needed, done server side
|
2011-06-08 15:28:05 +00:00 |
|
Nathan Gray
|
b3886ab828
|
Use a server call for all actions so whole query works
|
2011-06-08 15:27:46 +00:00 |
|
Nathan Gray
|
e9d33a174d
|
- Add more complicated actions
- Some other UI changes
|
2011-06-08 02:27:42 +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 |
|
Nathan Gray
|
249363f2b4
|
Add basic context menu
|
2011-06-06 17:46:01 +00:00 |
|
Nathan Gray
|
563b2f57ee
|
Only give calendar categories where the user has access to the resource's calendar
|
2011-06-03 00:05:37 +00:00 |
|
Nathan Gray
|
c81bd1a291
|
Change default charset from utf-8 to user's preferred charset
|
2011-05-24 15:57:16 +00:00 |
|
Nathan Gray
|
cae8752274
|
Make default import definitions available only to admins
|
2011-05-24 15:40:22 +00:00 |
|
Nathan Gray
|
16f9f37576
|
Add storage_info to list of fields for import/export
|
2011-04-14 17:05:16 +00:00 |
|
Nathan Gray
|
951f2b1a08
|
Attempt to set permissions for automatically created categories.
|
2011-04-14 16:57:49 +00:00 |
|
Nathan Gray
|
e61bb1abf7
|
Make sure lookups is initialized to an array
|
2011-04-13 14:32:45 +00:00 |
|
Nathan Gray
|
3333d18fae
|
Avoid warning from array_shift() if egw_link::delete_attached() doesn't return an array
|
2011-04-13 14:16:05 +00:00 |
|
Nathan Gray
|
d204c688c8
|
Strip HTML tags from long description
|
2011-04-05 23:36:40 +00:00 |
|
Nathan Gray
|
1c4101575c
|
Fix typo in error messages
|
2011-04-04 19:07:23 +00:00 |
|
Nathan Gray
|
fa8bf4218e
|
Use automatic processing for human friendly values
|
2011-04-04 19:07:06 +00:00 |
|
Nathan Gray
|
b8c35b954f
|
Default selection to search results
|
2011-03-28 22:10:59 +00:00 |
|
Nathan Gray
|
01fa7e080a
|
Rename ID field to Resource ID to deal with Excel issue
|
2011-03-28 17:03:53 +00:00 |
|
Nathan Gray
|
e5bb02d799
|
Add preferences so default export definition can be set
|
2011-03-28 15:37:26 +00:00 |
|
Nathan Gray
|
eeb336c77d
|
Missed etemplate change to allow custom fields in list
|
2011-03-24 14:22:18 +00:00 |
|