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

13505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	apps/files/index.php
 2013-09-16 10:42:37 +02:00
Thomas Müller
46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js 
refactor upload js & html to always use only js to fill form data
 2013-09-16 01:06:24 -07:00
Thomas Müller
c20f01bbf0 Merge pull request #4862 from owncloud/db_to_public 
Add OCP\DB::getErrorMessage() to public namespace.
 2013-09-16 00:51:12 -07:00
Thomas Tanghus
eab84d3d96 Add OCP\DB::getErrorMessage() to public namespace. 2013-09-16 02:17:39 +02:00
icewind1991
da0631e185 Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scanner-master 
adding null check on a mount's storage
 2013-09-15 13:47:16 -07:00
Thomas Müller
0f4e214a90 adding null check on a mount's storage 2013-09-15 20:40:40 +02:00
Morris Jobke
339c98e5e6 Merge pull request #4835 from owncloud/fix-apps-height 
use lineheight instead of padding and height
 2013-09-15 07:08:50 -07:00
Morris Jobke
58e6582056 Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter 
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
 2013-09-15 03:07:11 -07:00
Thomas Müller
db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons 
Use external and shared icons in OC.Dialogs.filepicker()
 2013-09-15 02:42:14 -07:00
Bernhard Posselt
a58e176852 Merge pull request #4506 from owncloud/oc_avatars 
OC Avatars
 2013-09-14 16:00:36 -07:00
Thomas Müller
a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist 
Ajax calls for "files" and "files_trashbin" apps
 2013-09-14 12:51:16 -07:00
Thomas Tanghus
dcc899d0a0 Merge pull request #4806 from owncloud/oc-dialogs-pageleave 
Don't popup meaningless alerts when dialog called on page leave
 2013-09-14 10:35:39 -07:00
kondou
c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
kondou
86143beb6a Remove superfluous $ 2013-09-14 14:15:52 +02:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Thomas Müller
6ff07f7681 Merge pull request #4712 from owncloud/fileapi-foreward 
Provide an implementation of the fileapi for oc6 build on top of the old api
 2013-09-13 14:31:11 -07:00
Thomas Müller
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()
 2013-09-13 21:44:31 +02:00
Vincent Petry
ec2f20f720 Fixed files_trashbin to also use hash URL part for IE8 2013-09-13 21:00:15 +02:00
Vincent Petry
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.
 2013-09-13 20:48:35 +02:00
Vincent Petry
4d38441e72 Fixed loading mask/spinner to stay fixed on scroll 2013-09-13 19:59:15 +02:00
Vincent Petry
611075bf20 Fixed JS error in trashbin app 2013-09-13 19:59:15 +02:00
Vincent Petry
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 +02:00
Vincent Petry
364e7991a4 Fixed ajax support to also update the current dir permissions 2013-09-13 19:59:15 +02:00
Vincent Petry
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.
 2013-09-13 19:59:15 +02:00
Thomas Müller
4ab5e58e02 update file summary on ajax file list load 2013-09-13 19:59:15 +02:00
Thomas Müller
4e751cbb47 fixing breadcrumbs on ajax loading of files 2013-09-13 19:59:15 +02:00
Thomas Müller
ef955bae56 calling replaceSVG() to display breadcrumb images correctly on IE8 2013-09-13 19:59:15 +02:00
Thomas Müller
e6f21927d6 fixing no-repeat for IE8 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
Thomas Müller
c149b57d3b Merge pull request #4840 from owncloud/adding-tb-master 
adding TB and GB to OC_Helper::humanFileSize
 2013-09-13 10:29:35 -07:00
Thomas Müller
049e57ac4a remove unused OC_L10N 2013-09-13 17:41:09 +02:00
Thomas Müller
8c9add4d32 adding TB and GB to OC_Helper::humanFileSize 2013-09-13 17:22:45 +02:00
Jörn Friedrich Dreyer
7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Bernhard Posselt
5633291cef use lineheight instead of padding and height 2013-09-13 15:53:03 +02:00
ringmaster
3790cbb493 Allow numeric group names 2013-09-13 09:06:20 -04:00
Thomas Müller
d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master 
Always check variable type before using readdir to avoid surprises
 2013-09-12 15:44:20 -07:00
Robin Appelman
58ed78aa9e cleanup public storage interface a bit 2013-09-12 21:58:32 +02:00
Robin Appelman
c9d2663159 Merge branch 'master' into fileapi-foreward 2013-09-12 21:43:35 +02:00
Jan-Christoph Borchardt
c7ca86799b Merge pull request #4816 from owncloud/fixing-723-master 
Fixing 723 master
 2013-09-12 07:48:00 -07:00
kondou
c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Thomas Tanghus
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
 2013-09-11 17:18:04 -07:00
Thomas Müller
9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Thomas Müller
5af111b0de added determineIcon to \OCA\files\lib\Helper 2013-09-12 00:39:52 +02:00
Thomas Müller
3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
kondou
4d62f747fa Clean up rawlist.php and fix non-array request 2013-09-12 00:21:01 +02:00
Thomas Müller
b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Thomas Müller
8543951cf9 adding icons for shared folders and external folders 2013-09-12 00:12:20 +02:00
Thomas Tanghus
80bf1969f9 Merge pull request #4784 from owncloud/ocdialog_option_setter 
Fix setting ocdialog options after initialization.
 2013-09-11 12:20:17 -07:00
Thomas Tanghus
08225a60c8 Save two lines 2013-09-11 21:15:32 +02:00
Thomas Tanghus
1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +02:00