Commit Graph

1542 Commits

Author SHA1 Message Date
ritt ed4d4f9eae Replaced SSLv23 method by TLSv1 method 2014-11-25 15:19:01 +01:00
ritt 9640fd9985 Fixed truncated character at GIT revision 2014-11-25 13:14:04 +01:00
ritt f5fc7e7700 Added code from KO to protect my_sell against alarm() signal 2014-11-24 13:22:10 +01:00
ritt 64388737f6 Fixed wrong quotes for inline styles 2014-11-05 15:54:23 +01:00
ritt 5cce57cbd8 Fixed debug output 2014-11-05 10:44:56 +01:00
ritt f8d2dcb11f Fixed another location of SSLV23 2014-10-24 12:33:27 +02:00
ritt da69122988 Disable SSLv23 (POODLE vulnerability) 2014-10-24 12:04:39 +02:00
ritt b69352d2aa Fixed LDAP issues 2014-10-23 14:03:04 +02:00
ritt b255121091 Added LDAP support, thanks to Valentin Kozlov <valentin.kozlov@kit.edu> 2014-10-23 13:55:30 +02:00
ritt f73cdf9887 Restructured demo logbook 2014-10-23 12:52:46 +02:00
ritt a6ae126a44 Merge branch 'develop' of https://bitbucket.org/ritt/elog into develop
Conflicts:
	src/elogd.c
2014-10-23 12:42:18 +02:00
ritt 5fb80f82fe Fixed Windows isues 2014-10-23 12:37:48 +02:00
ritt 09ec13b966 Increased number of possible socket connections from 10 to 100 2014-10-23 09:22:53 +02:00
ritt 214ac17c1b Create subdir before saving attachments 2014-10-22 19:53:01 +02:00
ritt b19549c947 Fixed debug output 2014-10-22 15:40:27 +02:00
ritt 57eebccb90 Fixed help text 2014-10-22 15:04:14 +02:00
ritt 690a9d257b Modified verbosity model, fixed keep-alive bug, switched to Cache-control 2014-10-22 15:01:59 +02:00
ritt 06a2a7a218 Explicitly search for ImageMagic if not found in path (needed to run inside XCode) 2014-10-21 17:29:47 +02:00
ritt 7916f6f615 Use sub-directories in all places 2014-10-21 17:13:19 +02:00
ritt 762b7d6708 Serve attachments correctly 2014-10-21 13:41:44 +02:00
ritt daedbc788c Implemented saving in subdirectories 2014-10-20 17:01:30 +02:00
ritt 4cd1a75acc Scan subdirectory tree for elog files 2014-10-20 13:54:18 +02:00
ritt 5ec68e0b82 Implemented first half of restructuring data directories (one subdir per year) 2014-10-03 17:57:14 +02:00
ritt 224abdac6a Further tweaking with strlcpy 2014-10-01 08:55:11 +02:00
Ritt Stefan 96bc1b4a40 Use strlcpy/cat from strlcpy.c 2014-10-01 08:45:26 +02:00
ritt 87b1e8e397 Fixed missing content-type 2014-10-01 08:18:58 +02:00
Dario Milicic 4d6e68f9b1 All new strings should now be localized. There is a new function called localize in the scripts/load-ckeditor.js that translates any given string to the server's language (This function is SYNCHRONOUS). The editor area should make use of more room on bigger screens. The make install command should now behave correctly. 2014-09-30 12:55:07 +02:00
ritt 5e1898ff11 Updated language files 2014-09-23 17:31:26 +02:00
ritt 6a67f991e2 Added "loc" command for JS localisation 2014-09-23 17:21:20 +02:00
ritt a8be56bfa1 Fixed date sorting problem before Sept. 9th, 2001 (seconds of epoche overhung 999'999'999) 2014-09-22 14:37:25 +02:00
Dario Milicic ee7bb02433 Revert "This is a commit that updates ELOG to the demonstration version for the SwissFEL student presentations. This version is just temporary and all changes will probably be reverted in a future patch."
This reverts commit 3463760570.
2014-09-10 18:48:25 +02:00
Dario Milicic 3463760570 This is a commit that updates ELOG to the demonstration version for the SwissFEL student presentations. This version is just temporary and all changes will probably be reverted in a future patch. 2014-09-10 17:34:40 +02:00
Dario Milicic 53bed4e1f9 Added a global progress bar for all custom plugins which upload files. Also added a progress bar for the drag and drop box for attachment upload. 2014-08-19 15:07:22 +02:00
Dario Milicic 74a2bb2705 Fixed the multilanguage support for the fileupload plugin. On the new entry page a new attachment drop box is added. Users can now drag&drop files into this drop box to be uploadad asynchronously and displayed as attachments on the page without reloading the entire page. 2014-08-14 13:59:07 +02:00
Dario Milicic 89d9f7a6ed File upload plugin implemented as a toolbar command and added some multilanguage support. Completely removed the old FCKeditor from the source code. 2014-08-08 15:42:40 +02:00
Dario Milicic 25ed9017de Modified the toolbar image upload button so it correctly uploads images to ELOG. Changed the response content type to application/json so the client won't have to parse the response to JSON. 2014-08-07 16:56:23 +02:00
Dario Milicic d05e6016b7 Replaced the FCKeditor with the new CKeditor v4. Implemented a plugin that allows dragging and dropping one or more files into the CKeditor - plugin name is dndfiles. Modified the save toolbar button on the CKeditor so that it behaves like a submit button. Implemented a timestamp plugin that behaves the same way as the old timestamp button on FCKeditor. Added a plugin to the CKeditor that allows typing LaTeX syntax. 2014-08-06 15:19:55 +02:00
ritt a883408085 Implemented first version of show_uploader_json() 2014-07-31 17:01:04 +02:00
ritt 09a357d2a4 Recompiled sources 2014-07-31 16:52:44 +02:00
ritt 7aa5378983 Fixed overlapping calls to strlcpy 2014-07-31 16:51:42 +02:00
ritt 1f6bbdeeb7 Fixed compiler warnings under Ubuntu 2014-07-30 13:07:42 +02:00
ritt 79778e1d52 Fixed compiler warnings under Ubuntu 2014-07-30 13:05:05 +02:00
Roger Kalt 44800a769b typo 2014-05-11 20:33:11 +02:00
ritt 9e02ed8e6d Added permission for OpenSSL linking 2014-05-04 21:18:36 +02:00
ritt 83a51175f4 Added GPL v3 according to Debian Policy Manual, thanks to Roger Kalt 2014-05-04 21:02:38 +02:00
ritt 2575a37e23 Increased buffer for shell commands 2014-02-21 13:08:59 +01:00
ritt a738232fdb Use heap memory in propagate_attrib to prevent stack overflows. 2014-01-13 09:25:57 +01:00
ritt 15ecf9fe52 Remeoved alarm() function for Windows 2014-01-13 08:56:32 +01:00
ritt d153ab0ba0 Merge branch 'master' of bitbucket.org:ritt/elog 2014-01-06 10:23:19 +01:00
ritt 6ad17c7150 Fixed compiler warning 2014-01-06 10:22:58 +01:00