411e6525b1
remove obsolete position rule from files app
2014-06-04 16:50:55 +02:00
e2e05c4798
adjust controls bar position for removed nav bar
2014-06-04 14:29:46 +02:00
f87a91fa00
Merge pull request #8837 from owncloud/issue/8720
...
Fix cursor and background of app navigation
2014-06-03 16:46:04 +02:00
69e5d5b8c0
remove specific sidebar size from Files app
2014-06-03 13:24:44 +02:00
74c647bb6a
Do not overwrite cursor in sidebar
2014-06-03 09:55:50 +02:00
cd61fb06eb
move Deleted Files to bottom of sidebar
2014-06-02 17:33:42 +02:00
3b4004f9e5
more subtle hover effect on sortable column, text instead of background
2014-06-02 16:23:22 +02:00
a447caf8d3
fix misalignment of modified dates, shift to right
2014-06-02 15:55:49 +02:00
708758f34e
remove unused table sizing CSS
2014-06-02 15:52:57 +02:00
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
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
d6e1643a0e
Fix dropping files below the table
2014-05-22 11:16:42 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
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
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
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
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
5757d02b76
fixes #7949
...
Sets height to form to avoid resizing when filename link is not shown
2014-05-13 20:02:22 +02:00
688f6162da
Add sorting to files list, trashbin and public files
2014-04-28 17:42:04 +02:00
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
924aee718c
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-16 14:58:27 +02:00
d0f84e936f
adding proper notification area for multi line messages
2014-03-26 00:04:11 +01:00
e6392163a4
adding ellipsis on file names
2014-03-25 23:40:40 +01:00
905aabf5d4
mobile: document min-width value
2014-03-21 16:43:40 +01:00
f2566e649f
mobile: adjust break to 768, also fix min-widths
2014-03-21 16:36:45 +01:00
c6aefada71
do not show Deleted Files on mobile, not optimized yet and button too long
2014-03-21 15:29:37 +01:00
40c20b2eeb
mobile: remove shift for multiselect bar to account for missing navigation
2014-03-21 14:34:05 +01:00
285fc5ba96
mobile: change CSS order so rename and versions are hidden
2014-03-18 11:50:08 +01:00
ec67d7e635
mobile: first mobile fixes for Files. We still need to hide Rename and Versions
2014-03-14 09:16:53 +01:00
6f56fd99a6
fix too much distance between text and icon
2014-02-21 14:10:13 +01:00
877cfb963a
use SVG icons from icons.css for New file menu
2014-02-21 14:07:25 +01:00
a282afcbbb
small change for compatibility
2014-02-17 13:27:07 -03:00
6e17d71a0d
remove forced lowercase from extension, fix #4747 , also coding style fixes
2014-02-13 10:39:38 +01:00
b56dbbe0e5
fix misalignment of modified dates, shift to right
2014-02-03 17:26:49 +01:00
6d7d3c16d0
ellipsize long modified dates to make room for showing delete button, fix #7040
2014-02-03 17:24:44 +01:00
5ccb395ec6
Makes Rename Icon Width 44px for touch sourfaces.
2014-01-31 12:33:00 +05:30
85e67be0aa
Rename action now appears as pencil icon
2014-01-30 10:07:08 +01:00
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
c767ebcc03
fix multiselect bar being too short on big displays
2014-01-24 18:20:52 +01:00
799e744ad7
remove background and width from multiselect bar, fix Download button not showing on mobile
2014-01-23 15:35:30 +01:00
809fb8482d
remove %webroot% from files app
2014-01-23 13:11:08 +01:00
9edbd142a2
Removes Bogus Styles.
2014-01-18 00:46:06 +05:30
b291fb9cd7
make sure there's enough room for the file actions
2014-01-17 15:47:26 +01:00
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
f975fd5499
Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase
2014-01-16 14:23:39 +05:30
db837bf696
improvements to public files mobile view
2014-01-15 15:48:42 +01:00
d8eac2b9bc
Merge branch 'master' into files-em-to-px
...
Conflicts:
apps/files/css/files.css
2014-01-15 14:59:50 +05:30
072ef7f010
remove min-width rule to fix mobile views
2014-01-14 22:14:46 +01:00
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
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
f2d18867af
change bold 'deleted files' button to normal for less focus
2013-11-18 15:06:38 +01:00
efbd79198b
Fixed preview URL + size while dragging an existing file
2013-10-28 15:41:52 +01:00
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
e79d853867
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 17:05:24 +02:00
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
b2986e1994
Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
...
Fixed delete icon alignment in IE8
2013-10-11 08:24:57 -07:00
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
39b150921d
Moved IE8 inline styles in files.css
2013-10-11 14:10:00 +02:00
980fc9cc7e
Fix trash bin button
2013-10-07 18:15:23 +02:00
39906cefbf
Converts em to px values for styles in Files.
2013-10-06 23:28:22 +05:30
cc1e69c190
Merge pull request #5136 from owncloud/design-fixes
...
Design fixes
2013-10-04 14:56:09 -07:00
fcb9b49d1f
increase font size of file actions for better readability
2013-10-04 20:25:18 +03:00
da0db7bcb2
fix multiselect bar opacity, webroot
2013-10-04 17:32:06 +03:00
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
13218ec689
remove duplicate upload CSS from files.css
2013-10-03 17:08:29 +03:00
f3e0cbdeed
fix position of New and Deleted Files buttons
2013-10-03 16:49:49 +03:00
f8093699f7
Merge pull request #5093 from owncloud/file-actions
...
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
4a5f3442b5
Closes Label inside the a tag for not hiding the fileactions.
2013-10-02 21:40:34 +05:30
81b4904c78
File Selected on Click instead of download.
2013-10-02 21:13:07 +05:30
9853b33420
reduce rounded corners of New dropdown
2013-10-02 18:04:08 +03:00
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
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
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
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
4d38441e72
Fixed loading mask/spinner to stay fixed on scroll
2013-09-13 19:59:15 +02:00
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
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
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
2cdde7a56a
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
...
Fixed missing checkboxes in IE8
2013-09-09 18:25:37 -07:00
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
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
4d04dd9c4c
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-06 13:42:05 +02:00
83afba5070
prefix #filestable to tbody tr
2013-09-06 10:01:11 +01:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
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
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
668c4c2652
fix issue with filetable background
2013-08-30 22:05:44 +02:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
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
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
cd41de839f
Fix "select all" checkbox displacement when checked
2013-08-26 10:57:14 +08:00
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
dce7cdaaec
remove unneeded extra ID selectors
2013-08-18 11:27:51 +02:00
bf4efd5290
move upload progress bar near upload button, more contextual
2013-08-18 11:18:16 +02:00
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +02:00
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
2fd5178a00
adjust New file dialog for new styles
2013-08-15 12:50:26 +02:00
b2f666c98f
fix file summary position
2013-08-14 21:26:06 +02:00
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
dba4111aa0
fix delete button not showing in IE8
2013-07-22 11:18:51 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
8eefaba719
some style adjustments
2013-07-10 12:30:11 +02:00
4818e0062e
General CSS cleanup
2013-07-09 16:08:32 +02:00
b1d0de95a9
Show a summary as the last filelist entry
...
Fix #993
2013-07-02 04:28:52 +02:00
806f3bddec
increase size of preview to size of row
2013-06-26 18:19:13 +02:00
1a8e4399b0
increase Files row height to tappable 44px, more breathing space
2013-06-25 15:09:48 +02:00
5d4ff0e537
better contrast for files list, darker greys for selection and hover
2013-06-11 14:49:34 +02:00
18618c75aa
color change to crumb elements as well.
2013-05-14 11:07:12 +05:30
6d95d130e4
Keeping Font Colors Consistant on the headers.
2013-05-13 23:12:05 +05:30
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 -07:00
5dd1f7d764
Using max-width instead of width for filename.
2013-03-30 00:13:47 +05:30
024b60decc
Adds a fixed width to the filename to prevent horizontal scroll.
2013-03-29 16:26:03 +05:30
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +01:00
afe7ea8ca2
fix files table CSS specificity issue causing multiselect bar overlap, fix #2075
2013-03-04 16:10:11 +01:00
de066beaaf
Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares
...
Fix file actions including permanent shares
2013-03-04 01:56:23 -08:00
d3ddf03687
Datepicker height fixed.
...
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
f4411b0243
durhurrrhurrr
2013-03-03 13:01:25 +01:00
07e9f8d0d3
remove general CSS from IE specific rules, displays Shared state permanently again
2013-02-26 18:49:20 +01:00
859caee66a
use :hover pseudo class to set opacity
2013-02-21 16:52:18 +01:00
b8a6bca2d3
always show checkbox when selected, also in IE8, fix #1621
2013-02-14 10:40:23 +01:00
25b5b39e7a
Files: fix width of table header when files are selected
2013-02-11 12:23:53 +01:00
419eced65c
Remove hascontrols - use original positioning.
...
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
2013-02-09 17:54:56 +01:00
60344bf1dd
Another attempt on the filelist heading.
2013-02-09 14:00:26 +01:00
680af2e6ca
Fix filelist shifting up one row on (multi)select
2013-02-08 22:30:27 +01:00
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
01b3c088a9
fix color change on click
2013-01-28 19:47:51 +01:00
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
9cd7bb2c8d
reverse z-index of a and input to make upload work again in ie8/9
2013-01-04 13:48:29 +01:00
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +01:00
86d510ba28
fix switched values from previous commit
2012-12-20 13:30:57 +01:00
babc0e4ac6
fix Firefox issues with file actions position and multiselect bar width
2012-12-20 12:02:19 +01:00
aa5f726f14
use slightly darker color for file actions background, fix fugly look for selected rows
2012-12-20 11:24:25 +01:00
c05ea8cfc3
fix file actions messing with file row height on narrower screens
2012-12-20 11:14:27 +01:00
5107ccbeda
move CSS from JS to CSS
2012-12-20 10:53:50 +01:00
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
e0ada2c24f
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
2012-12-13 19:44:55 +01:00
316a29f7ac
fix new button popup looking blurry
2012-12-13 19:04:27 +01:00
e7c4a2c8e1
ungreenify new & upload buttons
2012-12-13 00:12:21 +01:00
787e8b86d9
cleanup CSS whitespace and remove extra input[type='checkbok']
2012-12-07 17:41:52 +01:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
2ec96c7a63
fix new li icons jumping when replacing p with input
2012-12-07 17:21:26 +01:00
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
6864b28e47
rmeove vendor prefix for box-shadow
2012-12-07 15:32:24 +01:00
76395057d4
fix_new_and_upload_button_html_css
2012-12-07 15:32:24 +01:00
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
f477fda785
separate buttons for new file and upload
2012-10-26 18:16:42 +02:00
e307bf31c8
fix oc-605
2012-10-18 14:19:34 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
d1010e58d8
Update apps/files/css/files.css
...
Fixed a strange comment issue
2012-10-01 06:43:31 -05:00
2330dd5f21
Update apps/files/css/files.css
...
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
2012-09-30 20:02:52 -05:00
7aca730f71
Small css fix for button new in files. fix oc-1638
2012-09-24 18:40:59 +00:00
bcd3d1116c
Change background colour of upload button to be consistant with new button
2012-09-21 12:45:11 +00:00
6c644a0c83
change the new button color on mouse over so that the user understands that the button is actually two buttons.
2012-09-20 14:59:28 +02:00
1c643ce4bc
made upload button the same height in chrome and firefox
...
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
2012-09-19 22:10:13 +00:00
73ed13fe75
Increase click area of breadcrumb, fix oc-703
2012-09-19 12:31:02 +00:00
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
6b5f1ffdb4
upload button improvement, better separation, fix wrap issue
2012-08-27 14:05:18 -07:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
dfae77dec1
Add notifications and undo support for replacing files when renaming
2012-07-30 12:22:11 -04:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
5a48ade933
Make sure sharing and versions dropdowns come down in the same location for all files
2012-05-19 11:24:23 -04:00
e606213fa0
make upload work with IE again
2012-05-18 17:07:00 +02:00
e3f452cf53
larger clickable area for new button
2012-05-10 14:08:08 +00:00
2ae37b32d4
fixing background for clicked new button
2012-05-10 13:44:30 +00:00
8fc565821f
reduced text shadow brightness
2012-05-10 13:37:48 +00:00
46b1f35107
highlight the files new and upload button all the time
2012-05-10 13:34:44 +00:00
afeb9d9cbf
moving the file actions properly
2012-04-28 23:11:48 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
c0df15367f
fix style.css of the files app
2012-04-23 16:18:15 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
Jan-Christoph Borchardt
Morris Jobke
Joas Schilling
Lukas Reschke
Vincent Petry
Bjoern Schiessle
Bagera
Thomas Müller
David
raghunayyar
Morris Jobke
Jörn Friedrich Dreyer
Thomas Tanghus
Pete McFarlane
Alessandro Cosentino
Georg Ehrke
kondou
Pellaeon Lin
Georg Ehrke
Bart Visscher
Robin Appelman
Myles McNamara
Mat Lipe
Brice Maron
Tom Needham
Frank Karlitschek
Bernhard Posselt
Michael Gapczynski
Michael Gapczynski
Arthur Schiwon
Jan-Christoph Borchardt
Georg Ehrke