]>
source.dussan.org Git - nextcloud-server.git/log
Georg Ehrke [Tue, 24 Sep 2013 11:26:51 +0000 (13:26 +0200)]
add test data for cal and contact preview
Georg Ehrke [Tue, 24 Sep 2013 09:00:08 +0000 (11:00 +0200)]
add blacklist to txt preview backend
Thomas Müller [Mon, 23 Sep 2013 05:40:13 +0000 (22:40 -0700)]
Merge pull request #4327 from owncloud/scanfile-remove
remove deleted files while scanning
Bart Visscher [Sun, 22 Sep 2013 17:45:56 +0000 (10:45 -0700)]
Merge pull request #4623 from owncloud/convert-oc_preferences
Convert OC_Preference to object interface
Jenkins for ownCloud [Sun, 22 Sep 2013 16:58:42 +0000 (12:58 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 22 Sep 2013 15:40:20 +0000 (08:40 -0700)]
Merge pull request #4929 from owncloud/fixing-4416-master
Fixing 4416 master
Jörn Friedrich Dreyer [Sun, 22 Sep 2013 08:01:59 +0000 (01:01 -0700)]
Merge pull request #4938 from owncloud/scan-filter-outside-view
When filtering search results, ensure results are children of the...
Robin Appelman [Sat, 21 Sep 2013 23:23:18 +0000 (01:23 +0200)]
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
Thomas Müller [Sat, 21 Sep 2013 18:54:06 +0000 (11:54 -0700)]
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
namespaces use upcasefirst parts
Thomas Müller [Fri, 20 Sep 2013 18:47:24 +0000 (20:47 +0200)]
setting a default on filecache column unencrypted_size
Jenkins for ownCloud [Fri, 20 Sep 2013 14:50:14 +0000 (10:50 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:46:33 +0000 (16:46 +0200)]
remove unneccessary lib in namespace
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:37:07 +0000 (16:37 +0200)]
namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
Bart Visscher [Thu, 19 Sep 2013 21:22:32 +0000 (14:22 -0700)]
Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
Bart Visscher [Thu, 19 Sep 2013 17:59:45 +0000 (10:59 -0700)]
Merge pull request #4908 from owncloud/fix_css_selector
css selectors never have a : before []
Bart Visscher [Thu, 19 Sep 2013 17:12:16 +0000 (19:12 +0200)]
Add copyright, remove starting blank line
Bart Visscher [Wed, 18 Sep 2013 14:38:59 +0000 (16:38 +0200)]
update inherit docs comment
Bart Visscher [Sun, 1 Sep 2013 10:35:20 +0000 (12:35 +0200)]
Fix insert/update/delete helper functions for oracle
Bart Visscher [Sat, 31 Aug 2013 13:52:11 +0000 (15:52 +0200)]
Add missing return true statements to legacy preferences functions
Bart Visscher [Sat, 31 Aug 2013 13:50:47 +0000 (15:50 +0200)]
Add missing static
Bart Visscher [Sun, 3 Mar 2013 11:04:29 +0000 (12:04 +0100)]
Convert OC_Preference to object interface
Thomas Müller [Thu, 19 Sep 2013 15:23:07 +0000 (08:23 -0700)]
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
file upload conflicts dialog
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 15:00:54 +0000 (17:00 +0200)]
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/filelist.js
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 14:46:37 +0000 (07:46 -0700)]
Merge pull request #4900 from owncloud/fixing-4488-master
File permissions are part of the ajax response of file upload
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 12:49:45 +0000 (05:49 -0700)]
Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 12:46:33 +0000 (14:46 +0200)]
fix race condition in lazy preview loading
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 10:05:30 +0000 (12:05 +0200)]
use {count} instead of 'One' for more versatile translation
Thomas Müller [Thu, 19 Sep 2013 09:43:38 +0000 (11:43 +0200)]
Merge branch 'master' into fixing-4488-master
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:33:34 +0000 (11:33 +0200)]
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:32:56 +0000 (11:32 +0200)]
fix double translation of error message
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:25:41 +0000 (11:25 +0200)]
use n to translate title
Thomas Müller [Thu, 19 Sep 2013 09:15:20 +0000 (11:15 +0200)]
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
Thomas Müller [Thu, 19 Sep 2013 09:13:11 +0000 (11:13 +0200)]
fixing typos and l10n
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:11:22 +0000 (11:11 +0200)]
jsdoc types should go into {}
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 08:14:07 +0000 (10:14 +0200)]
css selectors never have a : before []
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 08:00:42 +0000 (10:00 +0200)]
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 07:47:51 +0000 (09:47 +0200)]
fix 'event is not defined' error
Christopher [Thu, 19 Sep 2013 05:17:04 +0000 (22:17 -0700)]
Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master
fixing syntax error - it it that hard to test own code?
Thomas Müller [Wed, 18 Sep 2013 21:46:58 +0000 (23:46 +0200)]
fixing syntax error - it it that hard to test own code?
Thomas Müller [Wed, 18 Sep 2013 21:42:36 +0000 (23:42 +0200)]
adding comma to get cleaner diffs in the future
Thomas Müller [Wed, 18 Sep 2013 21:06:48 +0000 (23:06 +0200)]
no file actions during upload
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:58:15 +0000 (17:58 +0200)]
indentation
Jenkins for ownCloud [Wed, 18 Sep 2013 15:50:02 +0000 (11:50 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:22:29 +0000 (17:22 +0200)]
simplify conflict template handling, fix reopen after ESC
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:20:14 +0000 (17:20 +0200)]
move upload dialog css to separate file
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:13:07 +0000 (17:13 +0200)]
allow passing classes to buttons
Bart Visscher [Wed, 18 Sep 2013 14:53:11 +0000 (07:53 -0700)]
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
kondou [Wed, 18 Sep 2013 14:47:27 +0000 (16:47 +0200)]
Translate errormsgs in settings/changepassword/controller
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 12:39:39 +0000 (14:39 +0200)]
hide excessive logging with a trace flag
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 12:19:58 +0000 (14:19 +0200)]
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 12:15:28 +0000 (14:15 +0200)]
Merge branch 'master' into fix_3728_with_file_exists_dialog
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 11:58:05 +0000 (04:58 -0700)]
Merge pull request #4769 from owncloud/gitignore_apps_fix
add slash so inverts are triggered
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 11:55:10 +0000 (04:55 -0700)]
Merge pull request #4872 from owncloud/refactor_upload_progress
refactor upload progress
Thomas Müller [Wed, 18 Sep 2013 11:09:47 +0000 (13:09 +0200)]
remove file action elements before recreating them
Thomas Müller [Wed, 18 Sep 2013 11:09:04 +0000 (13:09 +0200)]
store the permissions retrieved via ajax within the dom element
Morris Jobke [Wed, 18 Sep 2013 09:33:44 +0000 (02:33 -0700)]
Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page
disable avatar loading on public guest page
Thomas Müller [Wed, 18 Sep 2013 09:22:29 +0000 (11:22 +0200)]
add permissions of the file to the json response
Björn Schießle [Wed, 18 Sep 2013 08:33:52 +0000 (01:33 -0700)]
Merge pull request #4708 from owncloud/encryption_fixes
make sure that initial encryption also starts for a fresh installation
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 17:25:03 +0000 (19:25 +0200)]
disable avatar loading on public guest page
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 17:20:16 +0000 (19:20 +0200)]
we cannot load avatar on guest page
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 17:11:47 +0000 (19:11 +0200)]
Merge branch 'master' into fix_3728_with_file_exists_dialog
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 17:11:18 +0000 (19:11 +0200)]
use exists
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 17:10:46 +0000 (19:10 +0200)]
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
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 16:45:38 +0000 (18:45 +0200)]
add fixme
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 15:27:47 +0000 (17:27 +0200)]
make 'open in folder' action default for files
Jörn Friedrich Dreyer [Tue, 17 Sep 2013 15:25:47 +0000 (17:25 +0200)]
use correct doublequotes in template, remove container
Jörn Friedrich Dreyer [Wed, 31 Jul 2013 20:24:52 +0000 (22:24 +0200)]
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
Bjoern Schiessle [Tue, 17 Sep 2013 14:53:52 +0000 (16:53 +0200)]
performance improvement, check configuration only if no private key exists
Bernhard Posselt [Tue, 17 Sep 2013 13:07:50 +0000 (06:07 -0700)]
Merge pull request #4871 from owncloud/add_exists_method_to_jquery
add exists method to jquery
Bart Visscher [Mon, 16 Sep 2013 19:16:44 +0000 (12:16 -0700)]
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
Fix Sharing "Expiration Date" on Oracle
Jenkins for ownCloud [Mon, 16 Sep 2013 15:38:45 +0000 (11:38 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Mon, 16 Sep 2013 12:10:19 +0000 (14:10 +0200)]
refactor upload progress
Jörn Friedrich Dreyer [Mon, 16 Sep 2013 11:47:37 +0000 (13:47 +0200)]
add exists method to jquery
Jörn Friedrich Dreyer [Sun, 8 Sep 2013 10:12:01 +0000 (12:12 +0200)]
fix gitignore for all apps* folders
Thomas Müller [Mon, 16 Sep 2013 08:06:24 +0000 (01:06 -0700)]
Merge pull request #4838 from owncloud/refactor_upload_js
refactor upload js & html to always use only js to fill form data
Thomas Müller [Mon, 16 Sep 2013 07:51:12 +0000 (00:51 -0700)]
Merge pull request #4862 from owncloud/db_to_public
Add OCP\DB::getErrorMessage() to public namespace.
Thomas Tanghus [Mon, 16 Sep 2013 00:17:39 +0000 (02:17 +0200)]
Add OCP\DB::getErrorMessage() to public namespace.
icewind1991 [Sun, 15 Sep 2013 20:47:16 +0000 (13:47 -0700)]
Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scanner-master
adding null check on a mount's storage
Thomas Müller [Sun, 15 Sep 2013 18:38:57 +0000 (20:38 +0200)]
adding null check on a mount's storage
Morris Jobke [Sun, 15 Sep 2013 14:08:50 +0000 (07:08 -0700)]
Merge pull request #4835 from owncloud/fix-apps-height
use lineheight instead of padding and height
Morris Jobke [Sun, 15 Sep 2013 10:07:11 +0000 (03:07 -0700)]
Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
Thomas Müller [Sun, 15 Sep 2013 09:42:14 +0000 (02:42 -0700)]
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
Use external and shared icons in OC.Dialogs.filepicker()
Bernhard Posselt [Sat, 14 Sep 2013 23:00:36 +0000 (16:00 -0700)]
Merge pull request #4506 from owncloud/oc_avatars
OC Avatars
Thomas Müller [Sat, 14 Sep 2013 19:51:16 +0000 (12:51 -0700)]
Merge pull request #4501 from owncloud/ajaxfilelist
Ajax calls for "files" and "files_trashbin" apps
Thomas Tanghus [Sat, 14 Sep 2013 17:35:39 +0000 (10:35 -0700)]
Merge pull request #4806 from owncloud/oc-dialogs-pageleave
Don't popup meaningless alerts when dialog called on page leave
Bart Visscher [Sat, 14 Sep 2013 15:51:49 +0000 (17:51 +0200)]
Check all installed apps for console commands
kondou [Sat, 14 Sep 2013 12:35:23 +0000 (14:35 +0200)]
Use external and shared icons in OC.Dialogs.filepicker()
kondou [Sat, 14 Sep 2013 12:15:52 +0000 (14:15 +0200)]
Remove superfluous $
Jenkins for ownCloud [Sat, 14 Sep 2013 01:49:24 +0000 (21:49 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 13 Sep 2013 21:31:11 +0000 (14:31 -0700)]
Merge pull request #4712 from owncloud/fileapi-foreward
Provide an implementation of the fileapi for oc6 build on top of the old api
Thomas Müller [Fri, 13 Sep 2013 19:44:31 +0000 (21:44 +0200)]
- 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()
Vincent Petry [Fri, 13 Sep 2013 19:00:15 +0000 (21:00 +0200)]
Fixed files_trashbin to also use hash URL part for IE8
Vincent Petry [Thu, 29 Aug 2013 19:56:14 +0000 (21:56 +0200)]
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.
Vincent Petry [Wed, 4 Sep 2013 18:50:59 +0000 (20:50 +0200)]
Fixed loading mask/spinner to stay fixed on scroll
Vincent Petry [Sun, 1 Sep 2013 12:36:33 +0000 (14:36 +0200)]
Fixed JS error in trashbin app
Vincent Petry [Sun, 1 Sep 2013 12:24:01 +0000 (14:24 +0200)]
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.
Vincent Petry [Thu, 29 Aug 2013 21:45:02 +0000 (23:45 +0200)]
Fixed ajax support to also update the current dir permissions
Vincent Petry [Thu, 29 Aug 2013 18:59:45 +0000 (20:59 +0200)]
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.
Thomas Müller [Wed, 28 Aug 2013 23:17:04 +0000 (01:17 +0200)]
update file summary on ajax file list load
Thomas Müller [Tue, 27 Aug 2013 11:13:00 +0000 (13:13 +0200)]
fixing breadcrumbs on ajax loading of files