Commit Graph

1615 Commits

Author SHA1 Message Date
Uwe Steinmann
917e018bb4 initial functions for flash messages 2013-05-18 22:29:45 +02:00
Uwe Steinmann
2fe12295ea take over recent changes in 4.3.0 after merge with 4.2.2 2013-05-17 09:46:16 +02:00
Uwe Steinmann
9f945b2714 Merge branch 'seeddms-4.2.2' into develop
Conflicts:
	CHANGELOG
	views/bootstrap/class.ViewDocument.php
2013-05-17 09:42:33 +02:00
Uwe Steinmann
dc35122b10 fix release time 2013-05-17 09:34:10 +02:00
Uwe Steinmann
60ea8fccb4 new version 4.2.2 2013-05-17 09:31:52 +02:00
Uwe Steinmann
8238ed688e add changes for 4.2.2 2013-05-17 09:29:55 +02:00
Uwe Steinmann
e36d4c0094 fix approving of documents
The variable $status was overridden in the the status log if logged
in as admin. This causse problems whenever was allow to review/approve
documents. All other users where not affected because the don't see
the status log
2013-05-17 09:27:15 +02:00
Uwe Steinmann
7ea3c9a73a close folder chooser dialog when folder is selected 2013-05-17 08:47:04 +02:00
Uwe Steinmann
487f6b1806 fix minor layout error in folder tree (Bug #51) 2013-05-16 09:56:28 +02:00
Uwe Steinmann
36942e879e Merge branch 'seeddms-4.2.2' into develop 2013-05-07 20:20:19 +02:00
Uwe Steinmann
8cac883395 approver/reviewer can be set, even if admin
The old code got a list of all users with read rights on the document
and then checked if the users to be added as a reviewer/approver is
in this list. This did not work for the admin because the list
only includes regular users.
2013-05-07 20:16:09 +02:00
Uwe Steinmann
69a0578a74 no more php warning if translation could not be found in default lang 2013-05-02 18:31:26 +02:00
Uwe Steinmann
43323140a2 initialize substituted user in session to 0 2013-05-02 08:27:59 +02:00
Uwe Steinmann
9f8b928e1d Merge branch 'seeddms-4.2.1' into develop 2013-05-02 07:35:51 +02:00
Uwe Steinmann
baf4b9a979 new version 4.2.1 2013-05-02 07:19:19 +02:00
Uwe Steinmann
f559b74658 some more entries for 4.3.0 2013-05-02 07:11:01 +02:00
Uwe Steinmann
14e8d4ef02 set max execution time from settings 2013-04-30 20:00:50 +02:00
Uwe Steinmann
031751bd2f more entries for 4.3.0 2013-04-30 19:39:41 +02:00
Uwe Steinmann
947a4d83f8 put icons in clipboard into div to make them black 2013-04-30 19:38:48 +02:00
Uwe Steinmann
492c08e397 move tab pane into right page column 2013-04-30 19:26:33 +02:00
Uwe Steinmann
445277c825 Merge branch 'seeddms-4.2.1' into develop 2013-04-30 18:43:53 +02:00
Uwe Steinmann
7fa2ba6bcc shorten some menu entries to make the menu fit into one line 2013-04-30 18:43:19 +02:00
Uwe Steinmann
d4e8bedfbc add entry for new handling of document expiration 2013-04-30 18:38:56 +02:00
Uwe Steinmann
29b5dd476a make sure preview for related document is created before showing 2013-04-30 18:36:24 +02:00
Uwe Steinmann
a1f57d3e73 use some icon for editing comments 2013-04-30 18:19:28 +02:00
Uwe Steinmann
873f8ef47d fixed typo in phrase 'update' 2013-04-30 18:19:06 +02:00
Uwe Steinmann
57590fef86 show review/approval tab only if version has reviewer or approver 2013-04-30 18:14:05 +02:00
Uwe Steinmann
0e631bd09e check if expires is set in POST request without php warning 2013-04-30 18:06:44 +02:00
Uwe Steinmann
982d088339 status of latest document version is set to expired even if already released 2013-04-30 17:45:28 +02:00
Uwe Steinmann
9a9c57211e set typo in comment 2013-04-30 17:42:07 +02:00
Uwe Steinmann
26ae06b1ef set expiration date to currently set value 2013-04-30 17:41:32 +02:00
Uwe Steinmann
b1922c0e9f Merge branch 'seeddms-4.2.1' into develop 2013-04-30 17:29:10 +02:00
Uwe Steinmann
4d53a89435 fix phrase for selecting a category 2013-04-30 17:26:54 +02:00
Uwe Steinmann
f2a37f3e0e remove link on current version for setting the expiration date
the expiration date can only be set for the document
2013-04-30 17:24:45 +02:00
Uwe Steinmann
9400a962a8 maySetExpires() doesn't check if version modification is enabled
this makes no sense because a expiration date can only be set for
a document and not for the version
2013-04-30 17:23:24 +02:00
Uwe Steinmann
9a9d570d5f Merge branch 'seeddms-4.2.1' into develop 2013-04-30 17:15:21 +02:00
Uwe Steinmann
19061c5c2b set expiration date if set 2013-04-30 17:14:21 +02:00
Uwe Steinmann
4e27d0ce6b expiration date is sepearated by '-' instead of '/' 2013-04-30 17:03:39 +02:00
Uwe Steinmann
058c5f2749 expiration date of document can be set 2013-04-30 17:02:03 +02:00
Uwe Steinmann
c64dc58a77 Merge branch 'seeddms-4.2.1' into develop 2013-04-30 08:40:38 +02:00
Uwe Steinmann
5213e057b3 add style for preview images 2013-04-30 08:40:14 +02:00
Uwe Steinmann
1ef343903c show expiration date; show login on review/approval page 2013-04-30 08:36:53 +02:00
Uwe Steinmann
f7a5daa8a0 use same date format in getReadableDate() and getLongReadableDate() 2013-04-30 08:36:02 +02:00
Uwe Steinmann
025e88d5af add icon for setting approver/reviewer 2013-04-30 08:02:53 +02:00
Uwe Steinmann
17ea9bd88c new version 4.2.1 2013-04-30 08:02:28 +02:00
Uwe Steinmann
de59086fca add entry for fixed bug (when adding individual approver) 2013-04-30 08:01:49 +02:00
Uwe Steinmann
355900995d fix error when adding individual approver 2013-04-30 08:01:17 +02:00
Uwe Steinmann
7e6da855e2 Merge branch 'seeddms-4.2.1' into develop 2013-04-30 07:04:19 +02:00
Uwe Steinmann
cf8a82b48e fixed typo 2013-04-30 07:03:57 +02:00
Uwe Steinmann
034d7d6fd2 remove entry from 4.3.0 because it was done in 4.2.1 2013-04-29 19:56:44 +02:00