Commit Graph

1615 Commits

Author SHA1 Message Date
Uwe Steinmann
0565e9c55d fix code to determine if user is required for review 2013-04-08 09:12:56 +02:00
Uwe Steinmann
98450f2abf fix code to check if user is required for approval or review 2013-04-08 09:09:44 +02:00
Uwe Steinmann
abf12413da Merge branch 'seeddms-4.1.3' into develop 2013-04-08 08:52:53 +02:00
Uwe Steinmann
c1144612ab fix typo in variable for new comment 2013-04-08 08:51:44 +02:00
Uwe Steinmann
0ac30dadf3 Merge branch 'seeddms-4.1.3' 2013-04-08 08:49:28 +02:00
Uwe Steinmann
1fc78ff3b4 do not access protected variable _userID of DocumentLink 2013-04-08 08:48:29 +02:00
Uwe Steinmann
ec349a143d set fileformat to unix 2013-04-08 08:23:03 +02:00
Uwe Steinmann
d88e907086 merge from seeddms-4.1.2 2013-04-08 08:18:19 +02:00
Uwe Steinmann
26798d7676 Merge branch 'seeddms-4.1.2' into develop
Conflicts:
	Makefile
	inc/inc.Version.php
	install/install.php
2013-04-08 08:17:46 +02:00
Uwe Steinmann
848200ce1c Merge branch 'seeddms-4.1.2' 2013-04-08 08:16:38 +02:00
Uwe Steinmann
f9c60b2824 fix xml error 2013-04-08 08:01:50 +02:00
Uwe Steinmann
72200c5f96 prepare for new version 4.1.2 2013-04-08 07:58:28 +02:00
Uwe Steinmann
0d89fe7aa6 do not output folder name twice 2013-04-08 07:51:53 +02:00
Uwe Steinmann
382b9a4568 set propper folderList of subfolders after setting a new parent 2013-04-08 07:50:46 +02:00
Uwe Steinmann
afaa201a96 Merge branch 'seeddms-4.1.1' into develop
Conflicts:
	Makefile
	SeedDMS_Core/package.xml
	inc/inc.Version.php
	install/install.php
2013-04-05 16:57:56 +02:00
Uwe Steinmann
d8a70290a7 Merge branch 'seeddms-4.1.1' 2013-04-05 16:55:59 +02:00
Uwe Steinmann
0ac6ff9a91 prepare for version 4.1.1 2013-04-05 16:54:48 +02:00
Uwe Steinmann
93b525cf3f Merge branch 'seeddms-4.1.1' into develop 2013-04-05 13:24:21 +02:00
Uwe Steinmann
d5bbc67588 fix for sending notification after update 2013-04-05 13:23:27 +02:00
Uwe Steinmann
223daa97b1 set default theme to bootstrap 2013-04-05 13:09:08 +02:00
Uwe Steinmann
5d41aad78c prepare for next version 4.2.0 2013-04-05 13:08:37 +02:00
Uwe Steinmann
639355b1cf add method countChildren() 2013-04-05 13:07:50 +02:00
Uwe Steinmann
291919c20e major update of all new phrases in 4.1.0 2013-04-04 18:54:04 +02:00
Uwe Steinmann
54fe74e120 fix grammar and translation errors 2013-03-31 21:49:44 +02:00
Uwe Steinmann
61b4584541 Merge branch 'develop' 2013-03-28 13:40:45 +01:00
Uwe Steinmann
d564194cbe set date to today 2013-03-28 13:40:10 +01:00
Uwe Steinmann
8f8fc9bd75 Merge branch 'develop' 2013-03-28 13:34:41 +01:00
Uwe Steinmann
190c9a44f2 show number of attachments and related documents 2013-03-28 13:08:47 +01:00
Uwe Steinmann
dd8f01fe5a removed html tag br from phrase 'comment_for_current_version'
fixes bug #37
2013-03-28 10:22:38 +01:00
Uwe Steinmann
ffcd65ed3d do not use object if it does not exists 2013-03-28 10:20:07 +01:00
Uwe Steinmann
b95597c8ae show number of attachments and related documents
it is shown behind the tab title for related documents and attachments
2013-03-28 10:18:49 +01:00
Uwe Steinmann
adb5f7fa3b fix setting mandatory workflow
The method which was called didn't exist in SeedDMS_Core_User
2013-03-28 10:17:45 +01:00
Uwe Steinmann
dafd9655fc use more appropriate variable name $converters instead of $convcmd 2013-03-28 10:17:01 +01:00
Uwe Steinmann
5a3c2d9d4b if after all no translation could be found, take the language in the settings 2013-03-27 09:45:06 +01:00
Uwe Steinmann
114b51ebc5 read language file from new directory 2013-03-26 22:05:23 +01:00
Uwe Steinmann
452330709b replace NOW() by CURRENT_TIMESTAMP in sql statements 2013-03-26 21:06:20 +01:00
Uwe Steinmann
7f448c573a more changes for 4.1.0 2013-03-26 20:31:01 +01:00
Uwe Steinmann
759484841a do not access full name of user if he was deleted 2013-03-26 20:30:39 +01:00
Uwe Steinmann
0456c30a35 use passed convcmd instead of accessing $settings 2013-03-26 20:30:07 +01:00
Uwe Steinmann
f74f9b26f4 use passed convcmd instead of accessing $settings 2013-03-26 20:28:21 +01:00
Uwe Steinmann
97eeee5be7 pass $settings->_convcmd to view 2013-03-26 20:27:47 +01:00
Uwe Steinmann
2533963665 various improvements for mobile devices, pass folder id in upload url of jumploader
adding an attr in jumploader doesn't seem to work
2013-03-26 20:26:28 +01:00
Uwe Steinmann
f9fa8f0b70 do not access empty variable 2013-03-26 20:25:40 +01:00
Uwe Steinmann
d5a3486e02 prevent php warning if comment is not set 2013-03-26 20:25:13 +01:00
Uwe Steinmann
1c72478c3a retrieve folder id from $_REQUEST 2013-03-26 20:24:42 +01:00
Uwe Steinmann
555214c8ed check if post var dropfolderfileform1 is set 2013-03-26 20:20:23 +01:00
Uwe Steinmann
9690a77e28 make nav bar collapsable on small screens 2013-03-20 11:17:07 +01:00
Uwe Steinmann
083ff8aefc nicer layout of tab bar on small screens 2013-03-20 11:16:23 +01:00
Uwe Steinmann
315470e63a use bootstrap icons if folder tree 2013-03-18 08:46:24 +01:00
Uwe Steinmann
694a099e99 get folder for notification mail 2013-03-15 18:35:41 +01:00