Commit Graph

14535 Commits

Author SHA1 Message Date
cb0fc5db82 - merged SyncML-1.2 branch with trunk:
svn merge -r 26935:HEAD ^/branches/SyncML-1.2/calendar .
- with the exception of class.calendar_uiforms.inc.php,
  as it was not updated with the latest changes from trunk
  and I'm not sure about the changes
--> needs further discussion, sorry :-(
svn revert inc/class.calendar_uiforms.inc.php
2009-07-15 20:35:56 +00:00
036b2cd14e - merged SyncML-1.2 branch with trunk:
svn merge ^/trunk/infolog@27329 ^/branches/SyncML-1.2/infolog .
- completly reverted changes in inc/class.boinfolog.inc.php, as they are
  not related to SyncML at all:
svn revert inc/class.boinfolog.inc.php
2009-07-15 20:04:17 +00:00
d333605510 - merged SyncML-1.2 branch with trunk:
svn merge ^/trunk/addressbook@27378 ^/branches/SyncML-1.2/addressbook .
- re-added to trunk commits, which were somehow not in SyncML-1.2 branch:
svn merge -c 26581 ^/trunk/addressbook
svn merge -c 26582 ^/trunk/addressbook
2009-07-15 19:44:09 +00:00
e667e168b4 - merged SyncML-1.2 branch with trunk:
svn merge ^/trunk/phpgwapi@27377 ^/branches/SyncML-1.2/phpgwapi .
2009-07-15 19:31:25 +00:00
ab20b324e0 fix for: if no cf import fails with fatal error 2009-07-15 14:22:29 +00:00
6a12b7c448 fix for: if no cf import fails with fatal error 2009-07-15 14:22:13 +00:00
7c3f249f71 "added static function to check if file exists, which does NOT take the extension into account (can be used in the application code too)" 2009-07-15 11:31:02 +00:00
dc6b2905a9 fixed not working precistion display 2009-07-15 10:48:44 +00:00
1dc2c88059 fixed not working precistion display 2009-07-15 10:47:36 +00:00
9e13d1a73f some modifications to get iPhone working with EGroupware 2009-07-14 19:52:08 +00:00
8dc163f04f some modifications to get iPhone working with EGroupware 2009-07-14 19:51:03 +00:00
2bb5884ad9 Captcha widget based on secureimage, contributed by Randy Houlahan 2009-07-14 16:29:47 +00:00
1b3563e9a5 announce vacation message active status for by_date too 2009-07-14 08:08:53 +00:00
25dd696381 you need to have current_app modified when importing mail 2009-07-13 10:50:33 +00:00
7d0184e9ea you need to have current_app modified when importing mail 2009-07-13 10:47:19 +00:00
70fac00871 loading infolog translations if current_app is NOT infolog 2009-07-13 10:37:03 +00:00
b731dcbfe0 loading infolog translations if current_app is NOT infolog 2009-07-13 10:33:26 +00:00
ee2b5cf164 new param to delete method only return ids: can be used in extended class for deletes in other tables 2009-07-13 08:17:41 +00:00
919aea627e "use form_name (with replaced substitutes) instead of $cell[name], allows to put into the name something like \"app:$cont[id]:files/blah\" or \"app:$row_cont[id]:files/blub\"" 2009-07-13 08:14:59 +00:00
49c5b2933c New vfs-upload widget to upload files into vfs:
- if file already exists, show download and delete link
- if file does NOT exist, show upload box
Name or value of widget is either:
- vfs path or
- $app:$id:$relative_name (if empty($id) a temporary directory in users
  home directory is created and application is responsible to move
  content of that directory to the entry directory (/apps/$app/$id)
2009-07-11 09:07:59 +00:00
7dbb84081d "- allways display addressbook contact is imported to
- dont move accounts to default addressbook"
2009-07-10 12:41:35 +00:00
abbe9915fa "- allways display addressbook contact is imported to
- dont move accounts to default addressbook"
2009-07-10 12:39:00 +00:00
185a462ffb Implemented configurable unique id's in addressbook cvs import:
- primary unique id: id (default), uid, or any custom field
- fallback: id, uid(default), two from n_family, org_name or n_given,
or any custom field
- use default addressbook for new contacts (user preferences), if no
  owner specified
- some bugfixes
2009-07-09 13:31:33 +00:00
93dcba051f preserve the col_filter within the active session 2009-07-09 13:03:25 +00:00
25dc87e835 "only use default addressbook, if none is specified AND no existing contact already in a defined addressbook" 2009-07-09 13:02:57 +00:00
69d377b5d5 "use default addressbook for new contacts (user preferences), if no owner specified" 2009-07-09 12:38:50 +00:00
dc813fd741 Implemented configurable unique id's in addressbook cvs import:
- primary unique id: id (default), uid, or any custom field
- fallback: id, uid(default), two from n_family, org_name or n_given,
  or any custom field
- some bugfixes
2009-07-09 12:27:42 +00:00
aa1d033532 preserve the col_filter within the active session 2009-07-09 12:14:35 +00:00
20bb2bebac fix for lost owner selection in manage_states 2009-07-09 09:56:50 +00:00
1ac7c459c3 fix for lost owner selection in manage_states 2009-07-09 09:50:47 +00:00
afc6bc3b99 fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events 2nd.go 2009-07-09 08:33:25 +00:00
00c55151e3 fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events 2nd.go 2009-07-09 08:32:18 +00:00
917e529e8d fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events 2009-07-09 08:12:29 +00:00
7edb16d35a fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events 2009-07-09 08:10:29 +00:00
8f4960f9b4 "fixed messed up indention" 2009-07-08 10:29:06 +00:00
1e58b525d1 "fixed messed up indention" 2009-07-08 10:22:11 +00:00
6325b79080 removed not used javascript files 2009-07-07 12:55:36 +00:00
6fcef7b1e2 "handling text/rtf as rtf" 2009-07-07 10:13:27 +00:00
ae657f2b26 "handling text/rtf as rtf" 2009-07-07 10:12:31 +00:00
a81931ca08 removed not used javascript files 2009-07-07 09:58:20 +00:00
6ae1ca451f upgrade to 2.6.4.1, removing _samples and unneeded connectors, remove baseconfig for unneeded connectors 2009-07-07 09:21:36 +00:00
6570199588 remove baseconfig for unneeded connectors 2009-07-07 09:06:11 +00:00
b09f75d839 remove baseconfig for unneeded connectors 2009-07-07 09:05:21 +00:00
b0efbe2637 upgrading to 2.6.4.1, removing _samples and unneeded connectors 2009-07-07 08:58:12 +00:00
d160101c65 Make delete instance / domain checkbox actually remove the domain. DB still needs to be dropped manually. 2009-07-06 22:20:57 +00:00
6c1b4c588e reverted change of r72367 and fixed the real cause for the mainscreen_message problem: YOU SHOULD NOT HAVE TRANSLATIONS FOR mainscreen_message; You may have to force the reload of new language file-information 2009-07-06 15:40:42 +00:00
3307109a1c reverted change of r72366 and fixed the real cause for the mainscreen_message problem: YOU SHOULD NOT HAVE TRANSLATIONS FOR mainscreen_message; You may have to force the reload of new language file-information 2009-07-06 11:11:40 +00:00
d283757b8d fix regarding get_app in translation. array_merge does renumber and += seems to bear problems, if there already is a translation for the given key (mainscreen_message) 2009-07-06 09:26:18 +00:00
1e43e837c0 fix regarding get_app in translation. array_merge does renumber and += seems to bear problems, if there already is a translation for the given key (mainscreen_message) 2009-07-06 09:25:19 +00:00
62d3afdd36 "display on horizontal scrollbar for width 100%" 2009-07-04 14:17:58 +00:00