Stefan 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 |
|
Stefan Ritt
|
5fb80f82fe
|
Fixed Windows isues
|
2014-10-23 12:37:48 +02:00 |
|
Dario Milicic
|
7232f5cd9b
|
Merge branch 'develop' of https://bitbucket.org/ritt/elog into develop
|
2014-10-23 11:38:33 +02:00 |
|
Dario Milicic
|
39f100a402
|
All absolute URLs that were used for uploading files are now relative.
|
2014-10-23 11:38:14 +02:00 |
|
Stefan Ritt
|
2e29e26407
|
Don't overwrite certificates, themes and init script during 'make install'
|
2014-10-23 10:45:47 +02:00 |
|
Stefan Ritt
|
09ec13b966
|
Increased number of possible socket connections from 10 to 100
|
2014-10-23 09:22:53 +02:00 |
|
Stefan Ritt
|
214ac17c1b
|
Create subdir before saving attachments
|
2014-10-22 19:53:01 +02:00 |
|
Dario Milicic
|
46bdc62add
|
Localize function now uses the correct relative link.
|
2014-10-22 18:22:37 +02:00 |
|
Dario Milicic
|
f6275ffc09
|
Unnecessary console outputs removed.
|
2014-10-22 17:38:40 +02:00 |
|
Stefan Ritt
|
b19549c947
|
Fixed debug output
|
2014-10-22 15:40:27 +02:00 |
|
Stefan Ritt
|
57eebccb90
|
Fixed help text
|
2014-10-22 15:04:14 +02:00 |
|
Stefan Ritt
|
690a9d257b
|
Modified verbosity model, fixed keep-alive bug, switched to Cache-control
|
2014-10-22 15:01:59 +02:00 |
|
Stefan Ritt
|
06a2a7a218
|
Explicitly search for ImageMagic if not found in path (needed to run inside XCode)
|
2014-10-21 17:29:47 +02:00 |
|
Stefan Ritt
|
7916f6f615
|
Use sub-directories in all places
|
2014-10-21 17:13:19 +02:00 |
|
Stefan Ritt
|
762b7d6708
|
Serve attachments correctly
|
2014-10-21 13:41:44 +02:00 |
|
Stefan Ritt
|
daedbc788c
|
Implemented saving in subdirectories
|
2014-10-20 17:01:30 +02:00 |
|
Stefan Ritt
|
4cd1a75acc
|
Scan subdirectory tree for elog files
|
2014-10-20 13:54:18 +02:00 |
|
Dario Milicic
|
72a8401f14
|
All files that are uploaded when creating a new entry now appear in the attachment section where they can be deleted from the server entirely. NOTE: This does NOT automatically remove them from the editor as well.
|
2014-10-07 23:48:16 +02:00 |
|
Stefan Ritt
|
5ec68e0b82
|
Implemented first half of restructuring data directories (one subdir per year)
|
2014-10-03 17:57:14 +02:00 |
|
Stefan Ritt
|
20d70dbef2
|
Added Build Phase which calls script to create git-revision.h under Xcode
|
2014-10-03 11:11:05 +02:00 |
|
Stefan Ritt
|
2fc1758ac8
|
Ignore git-revision.h in GIT repository
|
2014-10-01 08:59:31 +02:00 |
|
Stefan 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 |
|
Stefan Ritt
|
3b860b286c
|
Removed -Wno-unused-result (not available under SL5) and added NEED_STRLCPY since Mac OSX has now its own implementation
|
2014-10-01 08:36:31 +02:00 |
|
Stefan Ritt
|
e4420a3e2d
|
Tweaked cp command in Makefile
|
2014-10-01 08:20:32 +02:00 |
|
Stefan Ritt
|
87b1e8e397
|
Fixed missing content-type
|
2014-10-01 08:18:58 +02:00 |
|
Stefan Ritt
|
9ba0408874
|
Undid comment change
|
2014-10-01 08:14:12 +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 |
|
Stefan Ritt
|
5e1898ff11
|
Updated language files
|
2014-09-23 17:31:26 +02:00 |
|
Stefan Ritt
|
6a67f991e2
|
Added "loc" command for JS localisation
|
2014-09-23 17:21:20 +02:00 |
|
Stefan Ritt
|
9297ebb858
|
Upgraded Xcode project file
|
2014-09-23 16:24:26 +02:00 |
|
Stefan 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 3463760570712e9ee6d653768022c116b34f40c0.
|
2014-09-10 18:48:25 +02:00 |
|
Dario Milicic
|
aab9ffe387
|
Merge branch 'develop' of https://bitbucket.org/ritt/elog into develop
|
2014-09-10 17:35:06 +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 |
|
Stefan Ritt
|
502845108b
|
Removed menu items which do not make sense with ELOG
|
2014-09-05 16:20:58 +02:00 |
|
Dario Milicic
|
16e6126304
|
Made the editor area a bit bigger. Replaced colored toolbar icons with black and white icons for more consistency. Expanded the custom config script so toolbar options can be easily modified.
|
2014-09-05 15:30:34 +02:00 |
|
Dario Milicic
|
528155798d
|
Merge branch 'develop' of https://bitbucket.org/ritt/elog into develop
|
2014-09-02 11:33:41 +02:00 |
|
Dario Milicic
|
50af7a8a92
|
Replaced absolute paths with relative paths in the project.
|
2014-09-02 11:31:46 +02:00 |
|
Stefan Ritt
|
b548f2ea5a
|
Added BuildRequires
|
2014-08-29 11:03:17 +02:00 |
|
Dario Milicic
|
06a1c240a6
|
Fixed a repository problem where one of the plugins was not downloaded when the repository is cloned.
|
2014-08-20 09:56:31 +02:00 |
|
Dario Milicic
|
e723e7e6b2
|
Deleted an internal git repository that was not correctly set up as a submodule.
|
2014-08-20 09:55:15 +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
|
228262bf70
|
Fixed a few bugs regarding sending empty responses. If no file is selected for upload an alert will appeart to notify the user.
|
2014-08-11 11:19:47 +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 |
|
Stefan Ritt
|
a883408085
|
Implemented first version of show_uploader_json()
|
2014-07-31 17:01:04 +02:00 |
|
Stefan Ritt
|
09a357d2a4
|
Recompiled sources
|
2014-07-31 16:52:44 +02:00 |
|