wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27238 commits 157 branches 562 tags 714 MiB
Commit graph

343 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
1583ae1ed6 force show the loading icon in list for deletion, not only on hover 2014-09-22 18:24:52 +02:00
Nicolas Stamm
a2a1f5da6a DragnDrop Upload text style 
The 8px margin was uggly.
 2014-09-16 16:51:48 +02:00
pdessauw
0d078e48ce Highlight every uploaded files and scroll down to the last one 2014-09-03 09:59:01 -04:00
Remco Brenninkmeijer
4f747aaa7a While busy cleaning, also removed extra enters 2014-07-17 13:05:58 +02:00
Remco Brenninkmeijer
616c5b2681 Corrected (Netbeans?) inserted spaces 2014-07-17 12:48:50 +02:00
Remco Brenninkmeijer
c8c00d27c4 Cleanup of unnecesary addition 2014-07-16 22:08:03 +02:00
Remco Brenninkmeijer
742589fe01 Show sorting icons when hovering over 2014-07-16 21:52:08 +02:00
Morris Jobke
a829d07234 Merge pull request #9403 from owncloud/design-fix-fileslistbottom 
Fix bottom of files list, add proper space to have room for dropdowns
 2014-07-03 16:40:38 +02:00
Jan-Christoph Borchardt
c7101d26db fix checkbox shifting when rename input appears 2014-07-03 13:34:12 +02:00
Jan-Christoph Borchardt
cee5afa8af reduce file list bottom whitespace a bit 2014-07-03 11:43:59 +02:00
Jan-Christoph Borchardt
6f14034c48 fix left margin of file list summary 2014-07-03 11:40:11 +02:00
Jan-Christoph Borchardt
4c97f2b3af add whitespace to bottom of Files list – more obvious it's the end, and space for share dropdown 2014-07-03 11:36:04 +02:00
Jan-Christoph Borchardt
e695244f32 fix position of rename function, and text size 2014-07-03 02:08:53 +02:00
Jan-Christoph Borchardt
079fee2c2a Merge pull request #9389 from owncloud/fix-nametext-height 
fix nametext height, was higher than the row
 2014-07-03 01:09:19 +02:00
Jan-Christoph Borchardt
a94130509a fix nametext height, was higher than the row 2014-07-02 22:54:30 +02:00
Jan-Christoph Borchardt
2a9fb130ec make sure table header is white instead of slightly grey 2014-07-02 15:40:52 +02:00
Vincent Petry
32d2457e58 Fix files list scroll behavior 
View container height needs to be accurate and span over the whole
scroll container for infinite scrolling to work properly.
 2014-07-01 21:48:06 +02:00
Jan-Christoph Borchardt
a4c693dd75 remove obsolete CSS, fix visual bug in share dialog #9255 2014-06-30 14:00:43 +02:00
Jan-Christoph Borchardt
a18658fa7f Merge pull request #9256 from owncloud/design-mobile-shared 
show share action of shared items darker to distinguish from non-shared,...
 2014-06-27 17:59:48 +02:00
Jan-Christoph Borchardt
e33fa226cd fix rename icon, fix #9257 2014-06-27 15:53:32 +02:00
Jan-Christoph Borchardt
b86b7fd143 show share action of shared items darker to distinguish from non-shared, fix #8898 2014-06-27 15:39:54 +02:00
Frank Karlitschek
2daffbc44e Merge pull request #9051 from owncloud/Bagera-master 
Fix delete action height
 2014-06-26 17:48:55 -04:00
Morris Jobke
9eb7ed4925 Fix ellipsis for folders on mobile screens 
* fixes #9162
 2014-06-26 16:37:34 +02:00
Bagera
bc65b25303 Aligning in the table header as well 
Aligning the columns and in the rows
 2014-06-16 14:15:55 +02:00
Bagera
28f420b337 Aligning with line height 
Remove "top:" in favour of setting "line-height" and fixing the
resulting problem with the input field being positioned wrongly.
 2014-06-16 14:11:58 +02:00
Bagera
e11abccded Fix delete action height 
Fix #8530 and align the all actions in the row
 2014-06-16 14:11:55 +02:00
Morris Jobke
b75fe439e7 fix CSS for upload button - fixes #8939 2014-06-16 13:51:49 +02:00
jbtbnl
b2c86b7a07 Merge pull request #8928 from owncloud/too-long-filename-fix-v2 
Ellipcises too long filenames
 2014-06-09 13:09:18 +02:00
Morris Jobke
e3429b63a2 improve ellipsis of filename for different screen sizes 2014-06-08 17:48:53 +02:00
raghunayyar
f3a605230a @jancborchardt's commit for cross browser compatibility of extension. 2014-06-08 15:06:01 +05:30
raghunayyar
09206f8a49 Adds class name to span element inside filename. 2014-06-07 23:54:21 +05:30
raghunayyar
d71bb7dbe4 Adds multiple media queries for filename. 2014-06-07 14:23:49 +05:30
Vincent Petry
e39e6a5584 Fixed delete button CSS in ext storage list 2014-06-06 15:33:33 +02:00
Jan-Christoph Borchardt
933c05566e Merge pull request #8922 from owncloud/design-controls-transparency 
Bugfixes for mobile
 2014-06-06 14:52:55 +02:00
raghunayyar
1d1f958bea Ellipcises too long filenames 2014-06-06 17:30:18 +05:30
Jan-Christoph Borchardt
08b5f787cc app settings: display input fields at full width 2014-06-06 13:01:24 +02:00
Jan-Christoph Borchardt
23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Thomas Müller
289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe 
Mobile sidebar swipe
 2014-06-06 11:27:04 +02:00
Vincent Petry
b2bae9313d Fixed viewer mode for sidebar swipe 2014-06-06 10:04:28 +02:00
Jan-Christoph Borchardt
9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Jan-Christoph Borchardt
990405d6ee fix position of sidebar toggle, fix Files controls position problems 2014-06-05 17:21:49 +02:00
Jan-Christoph Borchardt
dca5a03f8b fix files multiselect bar now that the app list is gone 2014-06-05 13:23:08 +02:00
Thomas Müller
1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two 
Toggle app navigation not only on mobile, but on desktop as well
 2014-06-05 10:53:22 +02:00
Jan-Christoph Borchardt
411e6525b1 remove obsolete position rule from files app 2014-06-04 16:50:55 +02:00
Jan-Christoph Borchardt
e2e05c4798 adjust controls bar position for removed nav bar 2014-06-04 14:29:46 +02:00
Morris Jobke
f87a91fa00 Merge pull request #8837 from owncloud/issue/8720 
Fix cursor and background of app navigation
 2014-06-03 16:46:04 +02:00
Jan-Christoph Borchardt
69e5d5b8c0 remove specific sidebar size from Files app 2014-06-03 13:24:44 +02:00
Joas Schilling
74c647bb6a Do not overwrite cursor in sidebar 2014-06-03 09:55:50 +02:00
Jan-Christoph Borchardt
cd61fb06eb move Deleted Files to bottom of sidebar 2014-06-02 17:33:42 +02:00
Jan-Christoph Borchardt
3b4004f9e5 more subtle hover effect on sortable column, text instead of background 2014-06-02 16:23:22 +02:00
Jan-Christoph Borchardt
a447caf8d3 fix misalignment of modified dates, shift to right 2014-06-02 15:55:49 +02:00
Jan-Christoph Borchardt
708758f34e remove unused table sizing CSS 2014-06-02 15:52:57 +02:00
Lukas Reschke
756b158230 Merge pull request #8663 from owncloud/files-dndissue 
Fixed drag and drop from external files, added tests
 2014-05-30 16:28:20 +02:00
Vincent Petry
6fbf4d8548 Fix table header colors 
Table headers should be 999 even when using links (introduced by the
sorting feature)

When selecting with checkboxes, they must appear black.
 2014-05-30 10:06:29 +02:00
Vincent Petry
d6e1643a0e Fix dropping files below the table 2014-05-22 11:16:42 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Vincent Petry
6fd084243b Fixed many issues, clean up 
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
 2014-05-15 17:51:04 +02:00
Vincent Petry
9d38e3602b Namespacing for FileList, FileActions and trashbin app 
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
  reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
  "files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
  the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
 2014-05-15 17:51:04 +02:00
Vincent Petry
9ccb3279dd Added app navigation for files app 
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
 2014-05-15 17:51:04 +02:00
Bagera
7b39704c61 Set row height in files table 
Sets row height to avoid resize when name is edited
 2014-05-14 08:32:48 +02:00
Bagera
5757d02b76 fixes #7949 
Sets height to form to avoid resizing when filename link is not shown
 2014-05-13 20:02:22 +02:00
Vincent Petry
688f6162da Add sorting to files list, trashbin and public files 2014-04-28 17:42:04 +02:00
Vincent Petry
9c2fbea6a4 Fix file selection for infinite scrolling 
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
 2014-04-28 14:55:00 +02:00
Jan-Christoph Borchardt
924aee718c fix shift of icons in 'New' menu in IE8/9, fix #7987 2014-04-16 14:58:27 +02:00
Thomas Müller
d0f84e936f adding proper notification area for multi line messages 2014-03-26 00:04:11 +01:00
Thomas Müller
e6392163a4 adding ellipsis on file names 2014-03-25 23:40:40 +01:00
Jan-Christoph Borchardt
905aabf5d4 mobile: document min-width value 2014-03-21 16:43:40 +01:00
Jan-Christoph Borchardt
f2566e649f mobile: adjust break to 768, also fix min-widths 2014-03-21 16:36:45 +01:00
Jan-Christoph Borchardt
c6aefada71 do not show Deleted Files on mobile, not optimized yet and button too long 2014-03-21 15:29:37 +01:00
Jan-Christoph Borchardt
40c20b2eeb mobile: remove shift for multiselect bar to account for missing navigation 2014-03-21 14:34:05 +01:00
Jan-Christoph Borchardt
285fc5ba96 mobile: change CSS order so rename and versions are hidden 2014-03-18 11:50:08 +01:00
Jan-Christoph Borchardt
ec67d7e635 mobile: first mobile fixes for Files. We still need to hide Rename and Versions 2014-03-14 09:16:53 +01:00
Jan-Christoph Borchardt
6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
David
a282afcbbb small change for compatibility 2014-02-17 13:27:07 -03:00
Jan-Christoph Borchardt
6e17d71a0d remove forced lowercase from extension, fix #4747, also coding style fixes 2014-02-13 10:39:38 +01:00
Jan-Christoph Borchardt
b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt
6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
raghunayyar
5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
raghunayyar
85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Jan-Christoph Borchardt
13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Morris Jobke
0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css 
Remove %webroot% from CSS
 2014-01-27 04:11:15 -08:00
Jan-Christoph Borchardt
c767ebcc03 fix multiselect bar being too short on big displays 2014-01-24 18:20:52 +01:00
Jan-Christoph Borchardt
799e744ad7 remove background and width from multiselect bar, fix Download button not showing on mobile 2014-01-23 15:35:30 +01:00
Jan-Christoph Borchardt
809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +01:00
raghunayyar
9edbd142a2 Removes Bogus Styles. 2014-01-18 00:46:06 +05:30
Jan-Christoph Borchardt
b291fb9cd7 make sure there's enough room for the file actions 2014-01-17 15:47:26 +01:00
Vincent Petry
2233aa2a04 Fixed files row height in Firefox/KDE 
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.
 2014-01-16 12:05:05 +01:00
raghunayyar
f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Jan-Christoph Borchardt
db837bf696 improvements to public files mobile view 2014-01-15 15:48:42 +01:00
raghunayyar
d8eac2b9bc Merge branch 'master' into files-em-to-px 
Conflicts:
	apps/files/css/files.css
 2014-01-15 14:59:50 +05:30
Jan-Christoph Borchardt
072ef7f010 remove min-width rule to fix mobile views 2014-01-14 22:14:46 +01:00
Morris Jobke
587fc1aff3 Fix resize issue for trash button in chrome and overflowing spinner in .update class 
fixes #6108
 2013-11-28 21:36:43 +01:00
Vincent Petry
14ad1ebf53 Added min width to files table 
Having a too small widths for the files table doesn't make sense as it
overlaps file actions with the files themselves and make them
unclickable, especially when viewed on mobile phone.

The compromise that this fix introduces is to have a minimum width that
will trigger horizontal scrolling, which will at least make it possible
to click files on mobile phones.
 2013-11-21 14:45:24 +01:00
Jan-Christoph Borchardt
f2d18867af change bold 'deleted files' button to normal for less focus 2013-11-18 15:06:38 +01:00
Vincent Petry
efbd79198b Fixed preview URL + size while dragging an existing file 2013-10-28 15:41:52 +01:00
Jörn Friedrich Dreyer
45e6d96702 prevent user from creating or renaming sth. to an existing filename 
- show tooltip when violating naming constraints while typing
- when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong
- fixes #5062
- also fixes some whitespace and codestyle issues in files js
- uses css selector over filterAttr in touched js files
 2013-10-22 18:11:03 +02:00
Vincent Petry
e79d853867 Removed extra bkg color on file actions when row is selected/hovered on 2013-10-14 17:05:24 +02:00
Vincent Petry
a4a52733f9 Fixed position of "delete" icon in files app 
There was an issue where only Chrome allows setting position: relative
on a td element.

This fix now works in IE8, Firefox and Chrome.

Fixes #5056
 2013-10-11 18:01:15 +02:00
Vincent Petry
b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox 
Fixed delete icon alignment in IE8
 2013-10-11 08:24:57 -07:00
Vincent Petry
2b2a548610 Fixed IE8 misaligned date 
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent

This works in IE8 and other browsers.

Fixes #5288
 2013-10-11 14:23:37 +02:00
Vincent Petry
39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Morris Jobke
980fc9cc7e Fix trash bin button 2013-10-07 18:15:23 +02:00
raghunayyar
39906cefbf Converts em to px values for styles in Files. 2013-10-06 23:28:22 +05:30
Morris Jobke
cc1e69c190 Merge pull request #5136 from owncloud/design-fixes 
Design fixes
 2013-10-04 14:56:09 -07:00
Jan-Christoph Borchardt
fcb9b49d1f increase font size of file actions for better readability 2013-10-04 20:25:18 +03:00
Jan-Christoph Borchardt
da0db7bcb2 fix multiselect bar opacity, webroot 2013-10-04 17:32:06 +03:00
Jan-Christoph Borchardt
041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03:00
Jan-Christoph Borchardt
c335169f6d increase height of controls bar and elements to more clickable 44px 2013-10-04 08:41:16 +03:00
Jan-Christoph Borchardt
13218ec689 remove duplicate upload CSS from files.css 2013-10-03 17:08:29 +03:00
Jan-Christoph Borchardt
f3e0cbdeed fix position of New and Deleted Files buttons 2013-10-03 16:49:49 +03:00
Jan-Christoph Borchardt
f8093699f7 Merge pull request #5093 from owncloud/file-actions 
File Selected on Click instead of download.
 2013-10-02 09:56:08 -07:00
raghunayyar
4a5f3442b5 Closes Label inside the a tag for not hiding the fileactions. 2013-10-02 21:40:34 +05:30
raghunayyar
81b4904c78 File Selected on Click instead of download. 2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt
9853b33420 reduce rounded corners of New dropdown 2013-10-02 18:04:08 +03:00
Jörn Friedrich Dreyer
7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/filelist.js
 2013-09-19 17:00:54 +02:00
Jörn Friedrich Dreyer
12ff268e60 move upload dialog css to separate file 2013-09-18 17:20:14 +02:00
Jörn Friedrich Dreyer
b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
 2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer
b40925ae17 initial scrollto implementation: 
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
 2013-09-17 18:40:51 +02:00
Vincent Petry
4d38441e72 Fixed loading mask/spinner to stay fixed on scroll 2013-09-13 19:59:15 +02:00
Vincent Petry
1304b511e9 Ajax calls for "files" and "files_trashbin" apps 
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list

Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
  functions
- Fixed some file paths in trashbin app to be similar to the files app
 2013-09-13 19:59:14 +02:00
Jörn Friedrich Dreyer
2c9b3d32ef unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack 2013-09-10 17:34:28 +02:00
Jörn Friedrich Dreyer
cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Thomas Tanghus
2cdde7a56a Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes 
Fixed missing checkboxes in IE8
 2013-09-09 18:25:37 -07:00
Vincent Petry
5f67ccba00 Fixed missing checkboxes in IE8 
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.

Replace it with a more compatible selector.
 2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer
ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer
4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Pete McFarlane
83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01:00
Jörn Friedrich Dreyer
49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer
4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +02:00
Alessandro Cosentino
4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Georg Ehrke
668c4c2652 fix issue with filetable background 2013-08-30 22:05:44 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
petemcfarlane
ab1f78eac3 prefix 'tbody tr' to separate app/core css errors 
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
 2013-08-30 10:48:04 +01:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
kondou
6bd0f3cba7 Reimplement filesummary in JS 
Fix #993
 2013-08-28 15:10:17 +02:00
Pellaeon Lin
cd41de839f Fix "select all" checkbox displacement when checked 2013-08-26 10:57:14 +08:00
Jörn Friedrich Dreyer
7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Jan-Christoph Borchardt
dce7cdaaec remove unneeded extra ID selectors 2013-08-18 11:27:51 +02:00
Jan-Christoph Borchardt
bf4efd5290 move upload progress bar near upload button, more contextual 2013-08-18 11:18:16 +02:00
Jan-Christoph Borchardt
7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Jörn Friedrich Dreyer
f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jan-Christoph Borchardt
d2767faf61 Merge pull request #4113 from owncloud/delete-fix 
Delete icon fix
 2013-08-15 15:31:42 -07:00
Jan-Christoph Borchardt
2fd5178a00 adjust New file dialog for new styles 2013-08-15 12:50:26 +02:00
Jan-Christoph Borchardt
b2f666c98f fix file summary position 2013-08-14 21:26:06 +02:00
Jan-Christoph Borchardt
cba0f69622 increase row height to 50px, properly position everything, checkboxes, actions etc 2013-08-14 20:41:20 +02:00
Jörn Friedrich Dreyer
e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
Jan-Christoph Borchardt
8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou 
General CSS cleanup
 2013-08-08 07:31:01 -07:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00