3121dc8cb5
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
...
Conflicts:
apps/files/js/filelist.js
2013-10-23 12:02:06 +07: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 +07:00
3bb7cf939e
Fixed ugly white space while loading file thumbnail
...
Preview images are now pre-loaded before being set on the file element.
This fixes #5135 and prevents a white space to be displayed while the
thumbnails is being loaded.
2013-10-22 12:08:05 +07:00
1c611a3dfb
give getSelectedFilesTrash() a unique name for the trash.js to avoid confusions with the same function in files.js
2013-10-18 10:57:10 +07:00
fab4102c51
Disabled ajax mode for public files view
...
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
2013-10-14 17:47:38 +07:00
3a3819b303
Merge pull request #5134 from owncloud/trashbin-homeiconbroken
...
Do not call changeDirectory() when no dir set on breadcrumb
2013-10-09 09:01:43 +07:00
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 +07:00
4ccbace68d
remove double uri encoding
2013-10-07 11:15:58 +07:00
6a4563f203
Fix breadcrumb to reinit dnd after ajax nav #5064
...
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.
This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +07:00
0736bfb43a
Do not call changeDirectory() when no dir set on breadcrumb
...
Some apps like the files_trashbin app do not set a directory on its
"home" breadcrumb link.
This fix makes sure that the click event doesn't do anything in that
case and lets the browser open the link.
This fixes the "home" icon in the trashbin app which now correctly
reopens the files app.
2013-10-04 17:49:42 +07:00
9d2595a7c5
Shortened notification message that was too long
...
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +07:00
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +07:00
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +07:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +07:00
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +07:00
98ff847830
fix race condition in lazy preview loading
2013-09-19 14:46:33 +07:00
c30c153ea5
fixing typos and l10n
2013-09-19 11:13:11 +07:00
0d81a53e12
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
2013-09-19 10:00:42 +07: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 +07: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 +07:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +07:00
611075bf20
Fixed JS error in trashbin app
2013-09-13 19:59:15 +07:00
3cf0820d35
Changed breadcrumb event handling to not use delegate
...
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
2013-09-13 19:59:15 +07:00
4e751cbb47
fixing breadcrumbs on ajax loading of files
2013-09-13 19:59:15 +07: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 +07:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +07:00
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +07: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 +07:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +07:00
46cbd7cd3b
fix preview issue when uploading a file with parentheses
2013-08-26 12:16:51 +07:00
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +07:00
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +07:00
bf04daff82
architecture too complex
2013-08-21 14:58:28 +07:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +07:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 +07:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +07:00
164502477d
use jQuery.get instead of jQuery.ajax
2013-08-16 17:25:38 +07:00
f94e603698
progress fixes
2013-08-16 11:40:55 +07:00
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +07:00
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +07:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +07:00
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +07:00
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +07:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +07:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +07:00
ac6a3133ec
style fixes
2013-07-30 12:33:54 +07:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +07:00
4a9f5f64da
remove whitespaces
2013-07-29 17:15:20 +07:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +07:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +07:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +07:00
cf449d42e8
properly encode path
2013-07-10 12:30:20 +07:00
d332b1d4a2
implement preview loading after upload
2013-07-02 11:13:22 +07:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +07:00
6778a45d45
use json to encode user list
2013-06-19 15:02:18 +07:00
85585ede02
allow scanning files for multiple users
2013-06-19 01:26:08 +07:00
56006ea852
small typo fix: added 2 whitespaces
2013-05-24 14:31:06 +07:00
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +07:00
3a6e39b990
It's a class
2013-04-28 23:28:41 +07:00
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +07:00
1507d1ef26
Files: Fix XSS when creating dropshadow
2013-04-22 21:55:54 +07:00
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 +07:00
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +07:00
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +07:00
7ecbaef16c
use css browser switch instead of deprecated jquery browser detection
2013-03-28 19:13:37 +07:00
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +07:00
868d7b956d
use === to compare empty string ''
2013-03-28 18:20:03 +07:00
831b7ca803
don't update progress bar in ie < 10
2013-03-28 18:20:03 +07:00
4dd4167f80
refactor files.js, make proper use of fileupload events
2013-03-28 18:17:18 +07:00
df31ee5a90
Merge pull request #2575 from owncloud/fixing-1461-master
...
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 +07:00
586a47b186
fixes #1463 - file size is now displayed correctly in IE8
2013-03-26 21:28:01 +07:00
cf50e67e1b
prevent to fire delete ajax a second time.
...
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +07:00
e0e5cb73bf
fixes #1461
2013-03-26 14:14:30 +07:00
f971ce0b66
let public link download handle json encoded file lists
2013-03-13 11:15:17 +07:00
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +07:00
1d83d76b45
fixed bug that prevented a newly created file to be opened with registered files actions
2013-02-25 17:50:17 +07:00
664e7a3fc2
use distance option to delay dragging in sane browsers
2013-02-25 15:08:14 +07:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 +07:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +07:00
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +07:00
fde0a8b520
Add Ability to the app to detect more details on the file
2013-02-18 13:22:43 +07:00
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +07:00
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +07:00
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 +07:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +07:00
c1072d0c09
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-31 23:26:40 +07:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +07:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +07:00
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +07:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +07:00
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +07:00
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +07:00
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +07:00
0089b17749
add multselect dnd
2013-01-30 12:59:34 +07:00
5761bd771f
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
...
hide upload progress bar and cancel action in IE < 10
2013-01-30 02:48:12 +07:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +07:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +07:00
dfab3d3d7f
call the trash bin view
2013-01-22 15:33:53 +07:00
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +07:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +07:00
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +07:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +07:00
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 +07:00
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +07:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +07:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +07:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 +07:00
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +07:00
5e16510a53
hide upload progress bar and cancel action in IE < 10
2013-01-18 22:06:42 +07:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +07:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +07:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +07:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +07:00
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
2013-01-11 16:47:28 +07:00
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +07:00
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +07:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +07:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +07:00
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +07:00
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +07:00
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +07:00
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +07:00
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +07:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +07:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +07:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +07:00
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +07:00
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +07:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +07:00
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +07:00
32c2b0d50e
enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty
2013-01-02 16:17:30 +07:00
8148c187a3
whitespace cleanup
2013-01-02 16:07:10 +07:00
48f6dccdb7
notifications are now shown/hidden using the js functions hideNotification and showNotification.
...
storage warnings are displayed in a notification.
as soon as a notification is hidden the storage warning will come back.
2013-01-02 15:09:40 +07:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +07:00
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +07:00
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 +07:00
5107ccbeda
move CSS from JS to CSS
2012-12-20 10:53:50 +07:00
915126cae8
Trigger last action before continuing with creating a new file/folder/from link
2012-12-16 16:25:08 +07:00
2607c565b0
Trigger the last action before continuing with a file upload, fixes issue #918
2012-12-16 16:19:51 +07:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +07:00
1443d6c3ef
fix mimetype icons for new files
2012-12-13 22:31:43 +07:00
e0ada2c24f
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
2012-12-13 19:44:55 +07:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +07:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +07:00
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +07:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +07:00
380db4a29e
Merge pull request #640 from esthepiking/master
...
Keyboard Shortcuts
2012-12-06 13:42:14 +07:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +07:00
0c6b53c25e
no message
2012-11-28 09:55:38 +07:00
ccb9bb4be0
initial setup
2012-11-28 09:50:49 +07:00
9a441d3e3a
show drag shadow in firefox by using helper:'clone'
2012-11-27 17:38:21 +07:00
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +07:00
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +07:00
b5b7a67f8a
Merge pull request #480 from owncloud/fix_435_and_437
...
Also reject names with \ in the name
2012-11-23 03:05:52 +07:00
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +07:00
8fb4dfd2ea
use background scanner
2012-11-23 00:20:46 +07:00
a81d7cd79f
introduce Files.containsInvalidCharacters(), use when creating or renaming files
2012-11-22 13:03:17 +07:00
cd495bf9ba
some more invalid characters have been added
2012-11-22 11:52:05 +07:00
1793e85a52
Also reject names with \ in the name
...
fixes issues #435 and #437
2012-11-22 11:52:05 +07:00
d4ec77e08b
Merge pull request #482 from eMerzh/fix_prevent_shared_folder
...
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 +07:00
02bc440900
Show error message to prevent adding a shared folder in the root dir fix #468
2012-11-16 14:59:14 +07:00
4a3b5125cf
adding comments on the form array indexes
2012-11-16 11:58:33 +07:00
7af4cf48c9
refs #461 - drag'n'drop upload to a sub folder is working now
2012-11-16 10:23:40 +07:00
bbef5b377e
add i18n for cancel button
2012-11-12 10:52:28 +07:00
e14054610f
Revert "fix blocking drag & drop upload of folders"
...
Fixes #150
This reverts commit 5b2f3c7f72
2012-11-07 21:59:18 +07:00
7b51a4e5f9
Merge pull request #306 from owncloud/crumb_drop_fix
...
extract the right file name for drag&drop.
2012-11-07 05:46:18 +07:00
168a2c7b6b
get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name.
2012-11-07 14:10:10 +07:00
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 +07:00
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +07:00
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 +07:00
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +07:00
5ecce8bfb7
Translate modification date when file is created/uploaded, use same strings as lib/template.php
2012-10-16 20:25:11 +07:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +07:00
5b2f3c7f72
fix blocking drag & drop upload of folders
2012-10-12 15:30:16 +07:00
2923d24921
add data-id directly after upload/creation to the file list (bugfix for #1917 )
2012-10-08 17:30:35 +07:00
4dba91838f
add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views.
2012-10-08 10:28:29 +07:00
4b446f3edd
Revert part of 5beca59b, fixes file upload bug oc-1926
2012-10-07 17:17:37 +07:00
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +07:00
5beca59b9c
check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist)
2012-10-05 10:32:38 +07:00
cfbca40fbe
fix sharing for newly uploaded or created files
2012-09-26 13:25:11 +07:00
4ea128ee43
Merge pull request #13 from scambra/safari-fixes
...
fix js success callback on safari when uploading files
2012-09-20 02:24:27 +07:00
aee8949c92
fix js success callback on safari when uploading files
2012-09-20 08:02:55 +07:00
6596094a28
add generated unique file name to the uploadingFiles list instead of the original name
2012-09-19 12:02:36 +07:00
21bffbfb69
Enhanced space handling - thx fmms
2012-09-17 11:14:44 +07:00
7a7d2a06b3
Adding a few more string to translation
2012-09-17 10:54:06 +07:00
7da3492ab5
show the size of new files when using New->From Url
2012-09-16 17:05:08 +07:00
d936590f77
Don't pass content for a new text file from UI, fixes bug oc-1660
2012-09-06 16:01:51 +07:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +07:00
a26ea6d65c
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
2012-09-05 00:12:25 +07:00
73d0a2b8f7
use OC.PERMISSION_X to filter selected drag'n'drop elements
2012-08-31 01:11:10 +07:00
077e988136
oc-1548: prevent user from leaving the page while a file upload is in progress
2012-08-31 00:45:03 +07:00
26ef012418
use permissions to quickfix drag selections
2012-08-31 00:13:02 +07:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +07:00
7c0a5d4a59
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:35:22 +07:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 +07:00
086397d8a1
Fix condition checking for resizing breadcrumbs
2012-08-04 15:57:49 +07:00
207ca3ec06
Dynamically resize breadcrumbs, fix for bug oc-468
2012-08-04 15:50:32 +07:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 +07:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 +07:00
b58e72cdb2
Alert user of errors when creating new files or folders
2012-07-23 22:35:34 +07:00
Jörn Friedrich Dreyer
Vincent Petry
Bjoern Schiessle
VicDeo
Georg Ehrke
Thomas Müller
Björn Schießle
kondou
Jan-Christoph Borchardt
Roman Geber
Robin Appelman
davidak
Lukas Reschke
Bart Visscher
Bernhard Posselt
VicDeo
Michael Gapczynski
Erik Sargent
Arthur Schiwon
Brice Maron
Alessandro Cosentino
scambra
icewind1991