Commit Graph

489 Commits

Author SHA1 Message Date
Ralf Becker
3c91753e80 moving add-icon(s) from header_right to header_row 2014-03-12 10:12:29 +00:00
Hadi Nategh
7e78248e81 Fix duplicate timesheet title caused by -r46199 and make fields in left and right column both symmetric 2014-03-12 08:43:35 +00:00
Stefan Reinhardt
3b49be6203 Timesheet edit Dialog - fix css + less
change postion dialogHeader - ICON and Info_number

edit.xet - put some classes in
2014-03-11 18:06:54 +00:00
Hadi Nategh
45871d6212 Put a breaking column in timesheet edit popup 2014-03-11 15:50:30 +00:00
Hadi Nategh
e694fa2029 Add dialogheader classes to timesheet edit popup template 2014-03-11 13:13:50 +00:00
Hadi Nategh
f007e39cfd Reorder fields in timesheet edit popup window, to make it similar to other popups layout 2014-03-11 09:59:35 +00:00
Hadi Nategh
306e3488ba style timesheet edit popup window 2014-03-10 15:19:28 +00:00
Ralf Becker
6dc9785a71 ts_project need to allow NULL 2014-02-25 10:30:27 +00:00
Ralf Becker
a714cf7e6c change timesheet title and project title to varchar(255) to not loose content when creating a timesheet from eg. an InfoLog entry
also change description to varchar(16384), if there is no longer content already, to save full table scans
2014-02-25 09:34:10 +00:00
Ralf Becker
b5a1af92d9 Pixelegg changes from Thursday 2014-02-19 08:21:01 +00:00
Nathan Gray
a2593672f4 Add missing template files 2014-02-18 23:53:18 +00:00
Ralf Becker
60def94d07 pixelegg changes from Monday 2014-02-18 08:11:14 +00:00
Ralf Becker
eeb420a7e7 pixelegg changes until now 2014-02-13 16:52:46 +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
Ralf Becker
d68349fa1b pixelegg changes until now 2014-02-12 15:50:24 +00:00
Ralf Becker
f99ae4af0d pixelegg changes from Tuesday 2014-02-12 08:10:11 +00:00
Hadi Nategh
7f222b165d Remove "BLACK DIAMOND SUIT" character from global categories 2014-02-03 09:19:59 +00:00
Nathan Gray
8072469b25 Remove unneeded onchange attribute, caused problems with filtering 2014-01-31 16:52:07 +00:00
Ralf Becker
cf96da6f2f enable sum-rows to be able to merge-print selections containing them and remove them later from the selection 2014-01-31 11:58:58 +00:00
Ralf Becker
530e9d13e3 fix not loaded sum-rows, caused by having no row-id 2014-01-30 18:47:42 +00:00
Ralf Becker
efd6bf87d5 eT2 date-timeonly distinguishes between empty=no time set (returned as null) and "00:00", old eTemplate could did not do that, also fixed ide warnings 2014-01-30 15:39:56 +00:00
Ralf Becker
0d8051837c translations from Stefan 2014-01-28 13:40:16 +00:00
Hadi Nategh
b3b4bc7dde Replace dropdown project list in time edit pop with link-entry 2014-01-20 13:53:29 +00:00
Ralf Becker
96e0c77fce pixelegg changes from thursday 2014-01-17 08:10:46 +00:00
Nathan Gray
782eb7f14c Fix filemanager context menu item opening in iframe 2014-01-16 17:23:39 +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
Ralf Becker
21bb9ef481 pixelegg changes from monday 2014-01-14 08:20:32 +00:00
Nathan Gray
d65b40046a Move sidebox favorites & backend out of nextmatch and into framework 2013-12-12 00:03:07 +00:00
Klaus Leithoff
3219eccec4 translation work provided by ingo, michael and other stylite staff 2013-12-06 08:05:58 +00:00
Hadi Nategh
9af3a9404d Replace old confirm() with new confirm dialog, and since we use generic method from et2_dialog class, then no need to have a seperate dialog creator function in app.js 2013-12-05 11:03:36 +00:00
Klaus Leithoff
68f2605cf4 translations generated/retrieved on translation site: Thank you for your contributions 2013-12-04 10:31:41 +00:00
Nathan Gray
d10025b462 Disable automatic chosen based on option count, chosen list is trapped inside the header. 2013-11-27 18:08:55 +00:00
Ralf Becker
73b6521cbf pixelegg changes from yesterday 2013-11-27 07:21:32 +00:00
Nathan Gray
3ab7b05737 Add category color to rows 2013-11-21 00:21:16 +00:00
Ralf Becker
2b7d9af0a2 reverting to previous app.css file and remove app.less files, as they are not used by pixelegg template and create some glitches, might re-introduce .less for regular templates later 2013-11-18 19:57:38 +00:00
Ralf Becker
f8752688e0 pixelegg changes from today 2013-11-15 17:09:58 +00:00
Ralf Becker
727cdc83b3 newewst pixelegg changed from today 2013-11-14 19:29:55 +00:00
Ralf Becker
583538e824 using now CSS preprocessor less (http://lesscss.org) to create some of our css files, used a lot in new Pixelegg template 2013-11-11 19:10:28 +00:00
Ralf Becker
77a30817d6 images for new Pixelegg template 2013-11-11 18:56:02 +00:00
Ralf Becker
6d226a7921 split constructor function and place of instanciation for app.js objects: app[appname] = new app.classes[appname](); 2013-11-04 20:54:23 +00:00
Ralf Becker
118d9e025d disabling all actions but add on sum rows 2013-10-04 11:19:42 +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
Hadi Nategh
1c42747547 REmove "Whole query" menu item from Tracker, Timesheet and Addressbook, while et2 nm handles selection differently 2013-09-23 08:31:07 +00:00
Hadi Nategh
552761113b Remove resubmit from the onchange event, since the nextmatch widget handles submission by itself 2013-09-20 09:34:49 +00:00
Hadi Nategh
e210d32b02 Fix not to refresh the edit popup window when trying to change project selectbox 2013-09-19 11:15:30 +00:00
Hadi Nategh
d0f967bdd8 Set prefix for CSS classes, timesheet app 2013-09-03 14:42:46 +00:00
Ralf Becker
c13dccd96e fixed not shown day-sum (caused by 0 == 'ts_id') 2013-09-02 18:03:00 +00:00
Klaus Leithoff
0dedd1faf7 commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-08-30 07:10:03 +00:00
Ralf Becker
a4ec8796af * Timesheet/PostgreSQL: fix SQL error when selecting a timerange 2013-08-29 10:59:00 +00:00
Hadi Nategh
40ba4bad22 Add favorite onto side-box menu for timesheet app 2013-08-29 08:25:46 +00:00
Hadi Nategh
7ee2c05955 remove extra app prefixes from method names in app.js, for both infolog and timesheet applications 2013-08-27 10:46:42 +00:00
Klaus Leithoff
07ed7f40a3 commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-08-27 08:54:10 +00:00
Ralf Becker
db7d12af4b first take on new ACL dialog for admin 2013-08-26 18:25:43 +00:00
Ralf Becker
aa8a848871 optional parameter for egw_framework::window_close() to specify an alert message, which get shown/alerted, before closing the window 2013-08-26 10:24:11 +00:00
Klaus Leithoff
dae7123c77 commit some lang file stuff; mostly french 2013-08-26 09:39:33 +00:00
Ralf Becker
0de6ab1b35 fix not working timesheet status and category actions: "disableClass", "enableClass" and "enableId" are now handled by action system itself, one should not set an explicit "enabled" attribute anymore 2013-08-26 08:24:50 +00:00
Ralf Becker
0ae2ebad94 adding ajax=true to index (no longer use an iframe), to enable drag-n-drop 2013-08-26 08:02:19 +00:00
Hadi Nategh
3f862f8b9a remove an old js() method from timesheet_ui which were no longer used in the code. 2013-08-23 07:35:42 +00:00
Ralf Becker
10f8c8e1ae not failing if filter or dates widgets are not there 2013-08-22 07:30:01 +00:00
Hadi Nategh
e572d77693 add app.js to timesheet application and run timesheet app by et2 2013-08-21 15:25:42 +00:00
Ralf Becker
1c4f65120c new egw_framework methods refresh_opener and window_close to call egw_refresh on opener or close popup window in a content security save way 2013-08-20 12:06:41 +00:00
Nathan Gray
cf8714293e Open preferences in preferences tab 2013-08-13 17:37:15 +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
Klaus Leithoff
28c5aa2c19 * Timesheet: fix for missing preset title 2013-06-10 12:22:09 +00:00
Ralf Becker
59f57d69b6 * Timesheet: allow to add timesheets starting yesterday and end today (no warning end-time before start-time) 2013-05-24 07:07:04 +00:00
Ralf Becker
50ed435eb7 * Calendar/InfoLog/Timesheet/Tracker/ProjectManager: edit focuses now automatic on title input 2013-05-23 09:01:33 +00:00
Nathan Gray
c20b9807bf Remove my custom fields from the default definition 2013-05-13 16:13:07 +00:00
Nathan Gray
8a55a0f99e Helps if I turn it on - Add context menu link to filemanager 2013-04-03 16:38:47 +00:00
Nathan Gray
47c07a45d5 Add context menu link to filemanager 2013-04-01 22:47:26 +00:00
Nathan Gray
b13ccf631c Add {{link}} placeholder to other apps 2013-03-20 14:51:09 +00:00
Ralf Becker
41116cd6fc * Timesheet: fixed SQL error when deleting a user and transfering his data to an other user 2013-03-07 12:40:38 +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
Nathan Gray
90fa3a8287 - Use egw_refresh() instead of changing href
- Listen to csv_export and don't save nextmatch query to session
2013-02-14 11:28:15 +00:00
Ralf Becker
4f247b26f8 merged translations and other uncommited ones 2013-02-08 19:03:20 +00:00
Nathan Gray
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Klaus Leithoff
f7baf624fa russian translations provided by Vladimir N. Gavrilov 2013-02-01 13:05:01 +00:00
Ralf Becker
525daf4a3e missing deleteaccount hook for timesheets 2013-01-24 09:27:48 +00:00
Nathan Gray
e39fcab548 Fix export 'Use search results' 2013-01-23 18:04:45 +00:00
Nathan Gray
a5ec4e5b36 Implement export filters for timesheet 2013-01-22 22:19:46 +00:00
Ralf Becker
be6845b4d0 * All apps: merged missing translations from other apps or branches 2013-01-18 13:48:34 +00:00
Klaus Leithoff
3fe0ecf662 * Infolog: fix problem regarding the display of wrong sums on timesheets when applying a search AND have multiple customfields set for timesheets 2013-01-17 15:55:08 +00:00
Christian Binder
c8a5fe221a enable more apps to be merged by filemanagers itempicker 2013-01-04 00:21:37 +00:00
Nathan Gray
f080e1ff34 Hide undelete context menu option when not viewing deleted items 2012-10-25 17:11:52 +00:00
Nathan Gray
e16ea584ba Add Un-delete to context menu 2012-10-24 15:50:48 +00:00
Nathan Gray
e8318b2442 Default timesheet history to on 2012-10-23 16:59:14 +00:00
Nathan Gray
7f2962b08e Show deleted status even when there are no statuses 2012-10-22 18:42:02 +00:00
Nathan Gray
014c720546 Don't add 'Deleted' status to status list, just add it where needed and use an Undelete button 2012-10-22 18:31:11 +00:00
Nathan Gray
ae77723140 Add delete protection to timesheet 2012-10-17 20:24:56 +00:00
Ralf Becker
f028e6d24e should fix Fatal error: Cannot use string offset as an array in line 671 2012-10-14 08:20:00 +00:00
Nathan Gray
20908f688e Fix broken conversion from human values 2012-10-10 16:24:46 +00:00
Nathan Gray
3cd94c9557 Remove double conditions from default import definitions 2012-10-09 16:27:01 +00:00
Ralf Becker
fef5a00623 docu update 2012-09-21 11:57:35 +00:00
Nathan Gray
1610a7523e Report conversion warnings 2012-09-20 16:28:42 +00:00
Klaus Leithoff
f3a40b341b * timesheet/mergeprint: add missing datefield definition 2012-08-24 11:45:28 +00:00
Ralf Becker
e913a6a263 pending translations from translation.stylite.de 2012-08-08 12:11:04 +00:00
Christian Binder
f81fd11435 tag applications which have implemented document merge 2012-07-04 17:00:03 +00:00
Ralf Becker
b89ac80f6b * Timesheet: filtering by a status did not contain timesheets of sub-status 2012-07-03 10:31:22 +00:00
Ralf Becker
ebb5244a7a * Tracker/Timesheet: support private custom-fields, existing fields stay public 2012-06-27 08:59:23 +00:00
Ralf Becker
3aac26d1ab * ProjectManager: allow datasources (eg. InfoLog) to set element category, update existing categories in elements to overwritten categories 2012-06-19 16:51:41 +00:00
Ralf Becker
2427a60c90 * Timesheet: if linked via ProjectManager, behave identical as if project was set in own GUI, fixed setting project to none to also unset project-title and blur 2012-05-30 08:21:18 +00:00
Ralf Becker
6ff1db3534 * Preferences all apps: add validation for vfs files and directories to give user immediate feedback about wrong or non vfs pathes 2012-05-22 13:51:30 +00:00
Ralf Becker
0abfcc9c99 * Timesheet: button [Save & New] keeps title (blur) set if called via timesheet submenu/icon of app (my.stylite.de bug #2669) 2012-05-22 11:58:10 +00:00
Nathan Gray
5ae2ad4964 Update default importexport definitions to use human values 2012-05-15 23:31:17 +00:00
Nathan Gray
e5fd49940f Return export object 2012-04-18 18:00:21 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Nathan Gray
4df977db0b Use js compatible with etemplate & etemplate2 2012-03-30 19:40:04 +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
a5be6a5016 * timesheet: fixed wrong sum for timesheets;
the retrieval of the summary (sum of duration and sum of price) has to take care that the customfield table is not joined, as the join causes a multiplication of the sum per customfield found; joining of the cutomfield table is triggered by criteria being set with either a string or an array, for this reason we set it to false, and pass the criteria as filter
2012-03-05 12:06:17 +00:00
Frédéric Erpicum
60b6c516ee ganttchart in popup for timesheet and calendar edit
remove date in timesheet bar title to make them shorter
2012-02-27 16:33:01 +00:00
Nathan Gray
871701d774 Fix links/[app] merge tag - copy/paste error 2012-01-13 19:49:19 +00:00
Nathan Gray
02861daf88 Add mergeprint tag for links to a specified application: links/appname 2012-01-06 18:35:34 +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
Klaus Leithoff
ad6cf1d8ae add/clarify status message when editing is not allowed via status; use check_statusForEditRights in controlling the edit state in edit mode as well 2011-11-10 08:45:44 +00:00
Klaus Leithoff
6f7a43a28c * timesheet: fix reported bug #2488 (stylite tracker), status and cat change still allowed via context menu, even if the entry in question should be ->edit by admins only<- (via status admin flag) 2011-11-09 14:52:33 +00:00
Nathan Gray
4ab5f97ed0 Add {{links}}, {{attachments}}, {{links_attachments}} placeholders 2011-10-26 16:45:38 +00:00
Ralf Becker
4ddfc607bc remove title-blur for same behavior after apply, as for opening the saved entry again 2011-09-21 15:07:27 +00:00
Ralf Becker
5a93e1d283 reverted accidently commited timesheet_ui 2011-08-24 07:20:12 +00:00
Ralf Becker
33c6766c88 - fixed xul_io class not exporting id of tab
- fixed tab widget to use id instead of label
- added attribute names for describtion (label) in xul_io, to export them as single attributes not comma-sep. as options
- added translate: true to description/label title
--> xet-files need to be dumped new, to get the tab-ids
--> seems like describtion value is translated unconditional, it should only be translated if no_lang attribute is not set or false, while label attribute is always translated (Andreas?)
2011-08-24 07:18:59 +00:00
Ralf Becker
26ce82186c also updated template in database, after Andreas change of the xet file 2011-08-15 09:15:01 +00:00
Andreas Stöckel
27d1173d2f Fixed bug in timesheet_ui edit.xet: Options not set properly 2011-08-15 08:46:40 +00:00
Ralf Becker
e1f25ca6bc * Timesheet: using only timesheet categories (tracker initialises global cat object) 2011-08-04 16:41:20 +00:00
Klaus Leithoff
b685831cbe add the xml export file for better changetracking 2011-07-20 15:23:36 +00:00
Klaus Leithoff
c0754a606e * timesheet: fix tabcontrol not working, fix for broken saving description in simple/short view mode 2011-07-20 10:59:07 +00:00
Nathan Gray
624839d0db Translations for placeholder labels 2011-07-05 22:21:49 +00:00
Nathan Gray
e1fce75a74 Cleanup translations - common importexport stuff 2011-07-04 20:06:30 +00:00
Nathan Gray
31d1e20bdc Fix typo: definitition -> definition 2011-07-04 20:00:26 +00:00
Nathan Gray
f5cf715e7a Cleanup translations - move common stuff into preferences 2011-07-04 19:23:28 +00:00
Ralf Becker
7f47700c13 file_access_user implementation for timesheet 2011-06-26 14:29:35 +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
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
1774e5674f support for multiple space or comma separated download dirs 2011-06-14 10:48:15 +00:00
Nathan Gray
541eae19ca Fix code formatting 2011-06-13 17:48:00 +00:00
Nathan Gray
418debd53c Fix indenting and sorting on statuses 2011-06-13 17:43:51 +00:00
Ralf Becker
220af27f60 Create template directory and set default document_dir preference of addressbook, calendar, infolog, tracker, timesheet and projectmanager 2011-06-11 11:57:51 +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
5a9e552fd8 fixed sometimes not working setting of multiple status (timesheet_bo::read($td_id) require ts_id as parameter not array("ts_id" => $ts_id)!) 2011-06-08 11:17:52 +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
36ed3f4f61 calling the global action-object-manager 2011-06-02 17:10:48 +00:00
Ralf Becker
f2434dd357 using now edit instead of view, as we do now, when there is no distinct view 2011-06-02 17:10:26 +00:00
Ralf Becker
486e99ec0c - Implemented a hook for timesheet_ui::edit to query calling apps for additional information to set in new tickets incl. links.
Replaces existing $_GET parameters, which are hard to set for new action system.
- also adding category color to infolog and tracker
2011-05-30 14:21:27 +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
41808c52c3 Add total field to merge 2011-05-12 19:30:01 +00:00