Commit Graph

4217 Commits

Author SHA1 Message Date
Uwe Steinmann
a6673fe908 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-20 17:21:24 +01:00
Uwe Steinmann
272b2c53e2 new version 5.0.10 2017-02-20 17:20:59 +01:00
Uwe Steinmann
67c7d83a72 use bootstrap theme 2017-02-20 14:06:04 +01:00
Uwe Steinmann
d2afc51aad add item to 4.3.33 2017-02-18 07:57:17 +01:00
Uwe Steinmann
6f0d9e5d5d move folders/documents propperly checks for access rights (Closes #309) 2017-02-18 07:55:40 +01:00
Uwe Steinmann
1b638d52ee remove calendar nav, add extra space to footer 2017-02-16 17:07:08 +01:00
Uwe Steinmann
502b5c5414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-16 15:26:46 +01:00
Uwe Steinmann
e65170ba97 add item for 4.3.33 2017-02-16 15:03:23 +01:00
Uwe Steinmann
9dfea210d6 new calendar based on fullcalendar 2017-02-16 15:02:46 +01:00
Uwe Steinmann
658d556c3d getTimeline() checks also for new attachments 2017-02-16 15:01:20 +01:00
Uwe Steinmann
63a405cb74 add parameter 'callback' to $('div.ajax') update 2017-02-16 14:59:49 +01:00
Uwe Steinmann
27255d1e67 add js for calendar 2017-02-16 14:58:44 +01:00
Uwe Steinmann
704fc28b34 comment, name must not be set, return json if requested 2017-02-16 14:54:55 +01:00
Uwe Steinmann
dd98d87d80 add new key rm_event, some updates 2017-02-16 14:43:28 +01:00
Uwe Steinmann
4443b80631 show events in year calendar, get rid of some div.well 2017-02-15 13:59:00 +01:00
Uwe Steinmann
fad908cbe0 add styles used in calendar 2017-02-15 13:55:30 +01:00
Uwe Steinmann
568e8a19e4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-15 08:24:08 +01:00
Uwe Steinmann
a16b58a9fa set workflow in addContent() after initial status has been set 2017-02-15 08:23:34 +01:00
Uwe Steinmann
0d99ffc04b add missing backticks 2017-02-14 21:12:50 +01:00
Uwe Steinmann
6cb83bec25 add missing backticks 2017-02-14 21:08:43 +01:00
Uwe Steinmann
83c498418b add field to group by, because it will be selected 2017-02-14 12:24:55 +01:00
Uwe Steinmann
c34ea0ed02 add another field to group by, because it shall be selected 2017-02-14 12:21:58 +01:00
Uwe Steinmann
823e57c4c2 take out order field as it is not needed 2017-02-14 12:13:03 +01:00
Uwe Steinmann
0bba1445c9 fix case of identifiers in sql statement 2017-02-14 12:07:23 +01:00
Uwe Steinmann
90982d5774 add missing backticks in sql statement 2017-02-14 12:00:08 +01:00
Uwe Steinmann
e6e0611937 pwdexpiration can be 'never' or 'now' 2017-02-14 11:34:10 +01:00
Uwe Steinmann
fc3548cca7 set pwdexpiration to 'now' and 'never' 2017-02-14 11:24:41 +01:00
Uwe Steinmann
586dffe403 setPwdExpiration() accepts keywords 'now' and 'never' 2017-02-14 11:24:11 +01:00
Uwe Steinmann
f251e30f5a fix sql error 2017-02-14 08:38:57 +01:00
Uwe Steinmann
9c7605d40a add method getSearchFields() ind ClassDocument and use in search() 2017-02-14 08:29:03 +01:00
Uwe Steinmann
f976bf0e83 check if temp table ttcontentid exists in sql statement 2017-02-14 07:15:14 +01:00
Uwe Steinmann
d9aaad16d3 add missing backticks around identifier in sql statement 2017-02-14 06:29:23 +01:00
Uwe Steinmann
0a6034a92e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-14 06:23:49 +01:00
Uwe Steinmann
0fbc5cc289 do not use x,y syntax in limit clause 2017-02-14 06:22:36 +01:00
Uwe Steinmann
f0b710b266 change fullname to fullName 2017-02-13 20:21:22 +01:00
Uwe Steinmann
28af59db73 remove double backticks in sql statement 2017-02-13 18:23:24 +01:00
Uwe Steinmann
a4eac8affc remove double backticks in sql statement 2017-02-13 18:20:21 +01:00
Uwe Steinmann
572fabfd1a add missing backticks around identifier 2017-02-13 18:16:24 +01:00
Uwe Steinmann
38ea469b12 add missing backticks 2017-02-13 12:48:54 +01:00
Uwe Steinmann
a65f4d56b5 add missing backticks around identifiers in sql statements 2017-02-13 12:47:15 +01:00
Uwe Steinmann
6a3bf35739 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-12 08:07:45 +01:00
Uwe Steinmann
a3a80f0a6b put backticks around identifier in sql statements 2017-02-12 08:07:14 +01:00
Uwe Steinmann
eae27d0646 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-11 16:33:48 +01:00
Uwe Steinmann
290ab91fc7 use 'fullName' instead of 'fullname' 2017-02-11 16:32:09 +01:00
Uwe Steinmann
6559706b15 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-11 15:21:45 +01:00
Uwe Steinmann
aa90fdaaf9 include LogInit.php 2017-02-11 15:20:52 +01:00
Uwe Steinmann
0229d329e3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-10 08:07:17 +01:00
Uwe Steinmann
c74caf1d43 fix sql statement in setOwner() 2017-02-10 08:06:22 +01:00
Uwe Steinmann
6e41c58beb add backticks around identifier in sql statements 2017-02-10 08:04:19 +01:00
Uwe Steinmann
2f0cb09e31 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-09 17:49:21 +01:00