534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
12 years ago
46f59b165e
Merge pull request #4838 from owncloud/refactor_upload_js
...
refactor upload js & html to always use only js to fill form data
12 years ago
c20f01bbf0
Merge pull request #4862 from owncloud/db_to_public
...
Add OCP\DB::getErrorMessage() to public namespace.
12 years ago
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
12 years ago
da0631e185
Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scanner-master
...
adding null check on a mount's storage
12 years ago
0f4e214a90
adding null check on a mount's storage
12 years ago
339c98e5e6
Merge pull request #4835 from owncloud/fix-apps-height
...
use lineheight instead of padding and height
12 years ago
58e6582056
Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
...
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
12 years ago
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
12 years ago
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
12 years ago
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
12 years ago
dcc899d0a0
Merge pull request #4806 from owncloud/oc-dialogs-pageleave
...
Don't popup meaningless alerts when dialog called on page leave
12 years ago
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
12 years ago
86143beb6a
Remove superfluous $
12 years ago
556bd1ef23
[tx-robot] updated from transifex
12 years ago
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
12 years ago
6eeb4d165c
- giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database
...
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
12 years ago
ec2f20f720
Fixed files_trashbin to also use hash URL part for IE8
12 years ago
30a2f2f352
Use hash part of URL for IE8 in files app
...
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.
This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.
From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.
In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.
When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
12 years ago
4d38441e72
Fixed loading mask/spinner to stay fixed on scroll
12 years ago
611075bf20
Fixed JS error in trashbin app
12 years ago
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.
12 years ago
364e7991a4
Fixed ajax support to also update the current dir permissions
12 years ago
4549cf519e
Added missing "files" JS to files_trashbin module
...
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.
This fix includes it here as well.
12 years ago
4ab5e58e02
update file summary on ajax file list load
12 years ago
4e751cbb47
fixing breadcrumbs on ajax loading of files
12 years ago
ef955bae56
calling replaceSVG() to display breadcrumb images correctly on IE8
12 years ago
e6f21927d6
fixing no-repeat for IE8
12 years ago
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
12 years ago
c149b57d3b
Merge pull request #4840 from owncloud/adding-tb-master
...
adding TB and GB to OC_Helper::humanFileSize
12 years ago
049e57ac4a
remove unused OC_L10N
12 years ago
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
12 years ago
7854cf04ee
refactor upload js & html to always use only js to fill form data
12 years ago
5633291cef
use lineheight instead of padding and height
12 years ago
3790cbb493
Allow numeric group names
12 years ago
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
12 years ago
58ed78aa9e
cleanup public storage interface a bit
12 years ago
c9d2663159
Merge branch 'master' into fileapi-foreward
12 years ago
c7ca86799b
Merge pull request #4816 from owncloud/fixing-723-master
...
Fixing 723 master
12 years ago
c9c5e1b97f
Merge branch 'master' into oc_avatars
12 years ago
b7205d97d7
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
...
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
12 years ago
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
12 years ago
5af111b0de
added determineIcon to \OCA\files\lib\Helper
12 years ago
3066b44928
remove unused $relativePath
12 years ago
4d62f747fa
Clean up rawlist.php and fix non-array request
12 years ago
b49f43c3ae
move icon generation logic out of the template
12 years ago
8543951cf9
adding icons for shared folders and external folders
12 years ago
80bf1969f9
Merge pull request #4784 from owncloud/ocdialog_option_setter
...
Fix setting ocdialog options after initialization.
12 years ago
08225a60c8
Save two lines
12 years ago
1f8f0e61d8
Remove test error :P
12 years ago
Bjoern Schiessle