Commit Graph

400 Commits

Author SHA1 Message Date
Uwe Steinmann
19d13f5b30 make fine uploader and btn-file usable twice on a page 2017-04-27 06:52:50 +02:00
Uwe Steinmann
a548710a55 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-04-11 17:08:59 +02:00
Uwe Steinmann
81926fe0b9 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-04-11 10:13:15 +02:00
Uwe Steinmann
93adee468f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-04-11 10:13:02 +02:00
Uwe Steinmann
71cc4da3a2 move css code into new css method of class.Timeline.php 2017-04-11 10:10:54 +02:00
Uwe Steinmann
923df99443 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-24 08:29:28 +01:00
Uwe Steinmann
da6958a936 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-24 08:24:39 +01:00
Uwe Steinmann
e584a7b1a5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-24 08:24:19 +01:00
Uwe Steinmann
fc90e71584 do not show spinner if data-no-spinner is set in '<div ..' 2017-03-24 08:22:52 +01:00
Uwe Steinmann
a65315c537 move all task output into own view 2017-03-20 12:41:21 +01:00
Uwe Steinmann
df27dcf878 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-20 11:54:55 +01:00
Uwe Steinmann
8afaf3c748 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-15 16:46:04 +01:00
Uwe Steinmann
c823981bd9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-15 16:45:02 +01:00
Uwe Steinmann
e21a096957 ?? 2017-03-15 16:42:18 +01:00
Uwe Steinmann
8ebe59c399 hide elements 'dialog' 2017-03-15 16:39:31 +01:00
Uwe Steinmann
479ee94fd8 take out command 'view', is now covered by view classes 2017-03-10 20:08:32 +01:00
Uwe Steinmann
d95943a365 enlarge interval for checkTask() and timeout of ajax call 2017-03-08 21:57:02 +01:00
Uwe Steinmann
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +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
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
fad908cbe0 add styles used in calendar 2017-02-15 13:55:30 +01:00
Uwe Steinmann
7d82b73208 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:12:07 +01:00
Uwe Steinmann
d5dc6b125d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-08 15:52:00 +01:00
Uwe Steinmann
196725042d add support for fine-uploader as a replacement for the old jumploader 2017-01-30 13:17:58 +01:00
Uwe Steinmann
f3b5af1c43 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-18 08:32:48 +01:00
Uwe Steinmann
de2cf19386 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 08:32:36 +01:00
Uwe Steinmann
98cf6c65df set more styles of popupbox 2017-01-18 08:32:02 +01:00
Uwe Steinmann
75d8413832 open popupbox even if title is an <i> tag 2017-01-18 08:31:34 +01:00
Uwe Steinmann
d3c7ef3088 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-18 08:11:12 +01:00
Uwe Steinmann
c943c2d81b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 08:10:59 +01:00
Uwe Steinmann
3dcf867634 add code to open and close popup box 2017-01-18 08:09:50 +01:00
Uwe Steinmann
ffcd0e8a4a add style for span.closepopupbox 2017-01-18 08:09:32 +01:00
Uwe Steinmann
d0662a6132 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-12 18:08:24 +01:00
Uwe Steinmann
950449ac04 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-12 18:03:01 +01:00
Uwe Steinmann
99805e5c30 add code and style for simple popup box 2017-01-12 16:41:44 +01:00
Uwe Steinmann
ba621af162 update tasks in menu only if logged in 2017-01-11 18:17:52 +01:00
Uwe Steinmann
95ebfe1657 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-09 21:13:42 +01:00
Uwe Steinmann
72535081d6 check for return value of mytasks api call
do nothing if data is null
2017-01-09 08:58:37 +01:00
Uwe Steinmann
cb1812a2f4 move js file into new directory 2017-01-06 07:23:20 +01:00
Uwe Steinmann
8ecd968812 add directory for password strenght 2017-01-06 07:23:14 +01:00
Uwe Steinmann
93ecbfc7b1 move js file into new directory 2017-01-06 07:17:48 +01:00
Uwe Steinmann
0817223524 add directory for password strenght 2017-01-06 07:16:52 +01:00
Uwe Steinmann
c6d26ec3fa Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-12-15 06:42:15 +01:00
Uwe Steinmann
a8b7277759 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-06 18:06:19 +01:00
Uwe Steinmann
5b459a187d make fileselect box work on pages with ajax
fileselect box in html code which was loaded by ajax didn't work
propperly. The selected file name wasn't shown.
2016-12-06 15:21:08 +01:00
Uwe Steinmann
5397dbd58c uncheck checkbox below expire date if date is set 2016-12-05 10:24:03 +01:00
Uwe Steinmann
662d9d0d85 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-22 10:34:15 +01:00
Uwe Steinmann
a4bec45158 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-22 10:28:29 +01:00
Uwe Steinmann
9015c1ea08 run $('.pwd').passwordStrenght() after loading html 2016-11-18 13:55:46 +01:00
Uwe Steinmann
ca76b64ba8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-08 12:00:44 +01:00
Uwe Steinmann
2ed68b22d2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-08 11:39:02 +01:00
Uwe Steinmann
c973a8c65b fix error in onAddClipboard()
used wrong variable name for event
2016-11-08 11:09:42 +01:00
Uwe Steinmann
7c7c35cbf4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-07 09:31:00 +01:00
Uwe Steinmann
91540ac6d9 set white background of preview images
if a document was converted from an office format to pdf and then to
png, the png has transparent areas on the borders of the page. This
makes the gray of the backgrond shine through, which looked quite ugly.
2016-11-07 09:29:01 +01:00
Uwe Steinmann
42bb8b4bf6 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-04 15:43:00 +01:00
Uwe Steinmann
014f6dfbb9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-04 15:42:45 +01:00
Uwe Steinmann
c485c272f5 turn .chzn-select-deselect into select2 box 2016-11-04 15:42:24 +01:00
Uwe Steinmann
e5016cf4f1 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-03 19:46:07 +01:00
Uwe Steinmann
f1f970b0e0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-02 18:13:18 +01:00
Uwe Steinmann
f36ffb1032 use select2 instead of choosen 2016-11-02 12:26:38 +01:00
Uwe Steinmann
7248c1a630 add replacement for chosen 2016-11-02 12:24:13 +01:00
Uwe Steinmann
b869c4253c Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-04 16:36:00 +02:00
Uwe Steinmann
0777d67443 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-04 16:35:42 +02:00
Uwe Steinmann
1790e5f6e7 refresh folder tree after document/folder move, make drag&drop work in Edge
Closes #286 and #288
2016-10-04 15:01:10 +02:00
Uwe Steinmann
926087a448 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-01 22:25:56 +02:00
Uwe Steinmann
5b3a2ec570 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-01 22:25:16 +02:00
Uwe Steinmann
d43db44318 add styles for symbols in workflow graph 2016-09-01 20:59:52 +02:00
Uwe Steinmann
bf25274fc0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-31 16:13:31 +02:00
Uwe Steinmann
c825356430 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-31 16:09:59 +02:00
Uwe Steinmann
9e6c5d41cc add grid extension for cytoscape 2016-08-31 16:09:37 +02:00
Uwe Steinmann
c92a6fb413 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-31 08:46:30 +02:00
Uwe Steinmann
ebcbe9f775 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-31 08:46:16 +02:00
Uwe Steinmann
3c0061fdaf overhaul graph layout (use cytoscape) 2016-08-31 08:44:45 +02:00
Uwe Steinmann
b646e4f9cf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-30 13:36:09 +02:00
Uwe Steinmann
5003c54deb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-30 08:46:59 +02:00
Uwe Steinmann
e67ef718cc add jquery validation 2016-08-30 07:59:03 +02:00
Uwe Steinmann
c8a689cf60 remove padding 2016-08-29 09:43:53 +02:00
Uwe Steinmann
eebb3e996d Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-10 17:53:12 +02:00
Uwe Steinmann
79e7a2babe Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-10 08:38:33 +02:00
Uwe Steinmann
b9c4e1a775 add js for click on .ajax-click 2016-08-09 18:14:58 +02:00
Uwe Steinmann
8165ee4776 remove opacity for badge 2016-08-09 15:15:00 +02:00
Uwe Steinmann
45fd0bf934 set timeout of mytasks ajax call to 1000ms 2016-08-02 11:49:52 +02:00
Uwe Steinmann
8410ca9273 add spinner when initially loading content by ajax call 2016-07-27 21:02:49 +02:00
Uwe Steinmann
76e8d25f87 add style for sidebar 2016-07-27 21:02:30 +02:00
Uwe Steinmann
38f02a149e Merge branch 'seeddms-5.0.x' into develop 2016-05-03 06:40:50 +02:00
Uwe Steinmann
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
fa413d0336 no action if folder is droped on itself 2016-04-29 08:10:10 +02:00
Uwe Steinmann
ea14c50838 mark jqtree element on hover 2016-04-29 08:09:37 +02:00
Uwe Steinmann
7d50c6e69d Merge branch 'seeddms-5.0.x' into develop 2016-03-31 11:19:36 +02:00
Uwe Steinmann
8cd3e6cada Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-31 11:17:47 +02:00
Uwe Steinmann
da6af81ec9 set width of .chosen-container on search page 2016-03-30 14:06:27 +02:00
Uwe Steinmann
2c297b5e1c take out javascript from html (Closes #253) 2016-03-29 07:59:20 +02:00
Uwe Steinmann
8b1effc2f3 Merge branch 'seeddms-5.0.x' into develop 2016-03-23 12:36:47 +01:00
Uwe Steinmann
d398f7733f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-23 12:34:50 +01:00
Uwe Steinmann
942de6cfee new style add-clipboard-area for receiving drop events
add new class to menu item for clipboard which allows to easily
drop an item into the clipboard even if the clipboard itself
isn't visible
2016-03-23 08:54:34 +01:00
Uwe Steinmann
d317388d18 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 08:10:15 +01:00
Uwe Steinmann
9a319ef539 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 08:06:37 +01:00
Uwe Steinmann
adcd6d7002 used for showing online editor 2016-03-09 07:48:50 +01:00
Uwe Steinmann
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +01:00
Uwe Steinmann
dc3958b456 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 06:40:14 +01:00
Uwe Steinmann
41c83dbe6d remove various console.log() 2016-03-08 22:04:00 +01:00
Uwe Steinmann
aca3db06c2 Merge branch 'seeddms-5.0.x' into develop 2016-03-08 10:46:16 +01:00
Uwe Steinmann
91e57e49da Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-08 10:42:21 +01:00
Uwe Steinmann
42ebb5d452 use bootbox when moving docs/folders via drag&drop 2016-03-08 10:38:51 +01:00
Uwe Steinmann
192700fd26 various minor cleanups 2016-03-08 08:02:17 +01:00
Uwe Steinmann
4bd2a9f766 Merge branch 'seeddms-5.0.x' into develop 2016-03-08 07:00:09 +01:00
Uwe Steinmann
4a45fb2e42 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-08 06:59:18 +01:00
Uwe Steinmann
6098fc9057 much cleaner drap&drop support 2016-03-08 06:56:58 +01:00
Uwe Steinmann
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +01:00
Uwe Steinmann
380718266f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 20:33:52 +01:00
Uwe Steinmann
9b1faa429f propperly set timeout of noty message if not passed 2016-02-15 17:44:56 +01:00
Uwe Steinmann
47a72cc2db move js for sending test mail into view 2016-02-15 09:27:44 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
f139625e4f fix link in autocompletion when search for object 2016-01-29 16:46:37 +01:00
Uwe Steinmann
ad41fd2571 fix calling checkTasks() 2016-01-19 10:10:38 +01:00
Uwe Steinmann
3bd4605c1f Merge branch 'seeddms-5.0.x' into develop 2016-01-18 12:17:35 +01:00
Uwe Steinmann
7568adb054 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-18 12:17:16 +01:00
Uwe Steinmann
60ba9577de new version which fixes a security hole 2016-01-14 20:04:18 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
1dff276217 div.splash can have a timeout attribute 2015-12-16 07:14:27 +01:00
Uwe Steinmann
abf1b90297 div.splash can have a timeout attribute 2015-12-16 06:35:46 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
836fcd4457 remove all javascript from html output and place in a seperate file
this requires to change the popover into bootbox
2015-12-11 20:29:52 +01:00
Uwe Steinmann
c80d579072 add bootbox 2015-12-11 20:23:01 +01:00
Uwe Steinmann
01aac2c23c div.splash will be used as splash message
make it hidden on the page
2015-12-11 08:11:10 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00
Uwe Steinmann
50e0d2a885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 08:41:40 +01:00
Uwe Steinmann
0c98a1ae71 class .datepicker turns datepicker on 2015-10-30 08:03:31 +01:00
Uwe Steinmann
f78e02e7e8 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 11:43:40 +01:00
Uwe Steinmann
b7d1b0e663 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 11:42:39 +01:00
Uwe Steinmann
aa1f10af1c add word-break class to output of orig filename
breaking long filenames will leave more space for the preview image
2015-10-27 11:41:02 +01:00
Uwe Steinmann
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
1972d961f3 initial test with webkitRelativePath (not used) 2015-10-20 18:14:39 +02:00
Uwe Steinmann
e52059df64 set color of div.timeline-event-selected 2015-10-19 13:16:28 +02:00
Uwe Steinmann
ddfea8f3cb Merge branch 'seeddms-5.0.x' into develop 2015-09-28 12:35:18 +02:00
Uwe Steinmann
1ab19f6831 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 12:35:04 +02:00
Uwe Steinmann
01449f66e3 check if data-query is set in div.ajax elements, pass it to the url 2015-09-25 16:16:48 +02:00
Uwe Steinmann
42b5162ca4 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 14:43:13 +02:00
Uwe Steinmann
f2762b6685 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:36:05 +02:00
Uwe Steinmann
de6cc16428 set background for items in timeline 2015-09-23 14:35:42 +02:00
Uwe Steinmann
b0edf297a2 Merge branch 'seeddms-5.0.x' into develop 2015-09-22 16:01:09 +02:00
Uwe Steinmann
58731cfdde Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 15:59:47 +02:00
Uwe Steinmann
cb4c6a5dbb add missing images for timeline 2015-09-22 10:55:27 +02:00
Uwe Steinmann
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
0d89f5b1c6 set font size of timeline boxes 2015-09-21 12:43:16 +02:00
Uwe Steinmann
d54172d366 Merge branch 'seeddms-5.0.x' into develop 2015-09-18 08:00:06 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
8ee257068e add some styles for timeline 2015-09-18 07:54:43 +02:00
Uwe Steinmann
e142404c71 make dialog for drop folder file list wider 2015-09-03 15:14:38 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +02:00
Uwe Steinmann
6e80f025cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 15:55:53 +02:00
Uwe Steinmann
36135883ee div.ajax uses data-view and data-action attributes if set 2015-08-20 14:51:14 +02:00
Uwe Steinmann
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
d1da7adadc <div class=ajax > can be used to include the result of ajax calls 2015-08-18 22:38:13 +02:00
Uwe Steinmann
6a45cbb05b set width of .chzn-select-deselect to 95% 2015-07-15 22:31:34 +02:00
Uwe Steinmann
4f2392e492 set timeout for checkTask() function 2015-07-10 08:28:19 +02:00
Uwe Steinmann
7a601a1cd0 checkTasks() also checks documents to receipt and revise 2015-07-09 18:29:08 +02:00
Uwe Steinmann
9682b02b8e define function which updates the tasks in the menu 2015-07-09 07:57:46 +02:00
Uwe Steinmann
ae288c83f2 add javascript for continuosily upating task list 2015-07-08 18:59:28 +02:00
Uwe Steinmann
d8df113676 add class 'help' 2015-06-15 09:24:56 +02:00
Uwe Steinmann
ae40f72b80 add class 'help' 2015-06-15 09:24:50 +02:00
Uwe Steinmann
4173dbcd20 add class 'help' 2015-06-15 09:24:25 +02:00
Uwe Steinmann
6c1ac6f038 set width of .chzn-select-deselect to 95% 2015-05-19 19:43:57 +02:00
Uwe Steinmann
040839714d init datepicker for #revisionstartdate 2015-04-22 10:32:25 +02:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
fc1c570366 add missing minified css 2015-02-24 19:47:47 +01:00
Uwe Steinmann
2d3b8752e4 add missing files 2015-02-24 19:47:25 +01:00
Uwe Steinmann
3ddb3c45e9 missing picture 2015-02-24 19:46:03 +01:00
Uwe Steinmann
223ea964f4 new version 1.3.0 of chosen 2015-02-13 17:38:11 +01:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 12:49:21 +02:00
Uwe Steinmann
ae848f209b check file size before uploading, show msg returned by addtoclipboard 2014-07-11 12:03:29 +02:00
Uwe Steinmann
a507a94c00 add code for handling drag&drop file upload 2014-07-11 08:40:24 +02:00
Uwe Steinmann
e21cf3d206 add styles for fast upload area 2014-07-11 08:39:44 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-07-08 08:49:14 +02:00
Uwe Steinmann
cc61505825 document/folder chooser even works for forms not named 'form1' 2014-07-07 15:45:24 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-03 12:07:27 +02:00
Uwe Steinmann
99efd352f1 add style for mandatory reviewers/approvers on AddDocument page 2014-06-17 18:10:12 +02:00
Uwe Steinmann
f1a9923f57 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-06-06 15:13:15 +02:00
Uwe Steinmann
a85a620d80 dropping object on clipboard uses ajax to add object to clipboard 2014-06-06 15:07:49 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-06 14:15:39 +02:00
Uwe Steinmann
5d65985fa1 make icons in document/folder list a bit bigger 2014-06-06 14:01:53 +02:00
Uwe Steinmann
65b82832bc add click function for a.lock-document-btn 2014-06-06 13:59:42 +02:00
Uwe Steinmann
5f3f52db79 more functions to handle clipboard operations 2014-06-05 15:01:51 +02:00
Uwe Steinmann
58cdecfe21 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-05 10:03:35 +02:00
Uwe Steinmann
a0148fe37a add click function for button.removefolder
add code which hides popovers when clicke somewhere on the page
2014-06-05 09:49:20 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-06-04 21:25:30 +02:00
Uwe Steinmann
0e27982c08 add click function for button.removedocument, pass formtoken to ajax calls 2014-06-04 19:19:23 +02:00
Uwe Steinmann
0b63fe6960 set pointer for 'list-action.a' 2014-06-04 19:18:48 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
2014-05-22 08:21:22 +02:00
Uwe Steinmann
a65ff953f5 add css for new file upload chooser 2014-05-16 09:18:31 +02:00
Uwe Steinmann
315111a778 add nicer looking file upload chooser 2014-05-16 09:17:43 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
a8aea2ff93 new favicon 2014-04-11 11:10:57 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-04-09 06:26:32 +02:00