]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoclass API decommissioning part 1
Thomas Müller [Wed, 25 Sep 2013 09:05:24 +0000 (11:05 +0200)]
class API decommissioning part 1

11 years agoAppFramework:
Thomas Müller [Wed, 25 Sep 2013 08:30:48 +0000 (10:30 +0200)]
AppFramework:
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Wed, 25 Sep 2013 07:52:12 +0000 (09:52 +0200)]
Merge branch 'master' into appframework-master

Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 24 Sep 2013 16:59:48 +0000 (12:59 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #4898 from owncloud/server_folder_methods
Thomas Müller [Tue, 24 Sep 2013 13:58:47 +0000 (06:58 -0700)]
Merge pull request #4898 from owncloud/server_folder_methods

Server folder methods

11 years agoMerge pull request #4963 from cyberb/patch-1
Christopher [Tue, 24 Sep 2013 11:45:13 +0000 (04:45 -0700)]
Merge pull request #4963 from cyberb/patch-1

fixing typo

11 years agoMerge pull request #4930 from owncloud/fix-apps-settings
Thomas Müller [Tue, 24 Sep 2013 08:02:50 +0000 (01:02 -0700)]
Merge pull request #4930 from owncloud/fix-apps-settings

Fix the apps enabling/disabling in settings

11 years agoMerge pull request #4917 from owncloud/scan-clear-permissions
Thomas Müller [Tue, 24 Sep 2013 07:50:33 +0000 (00:50 -0700)]
Merge pull request #4917 from owncloud/scan-clear-permissions

clear permissions cache when scanning a file

11 years agofixing typo
Boris Rybalkin [Tue, 24 Sep 2013 01:08:58 +0000 (21:08 -0400)]
fixing typo

Typo in comment "feature" => "future"

11 years agoDo not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
Andreas Fischer [Mon, 23 Sep 2013 22:59:23 +0000 (00:59 +0200)]
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).

11 years agoclear permissions cache when scanning a file
Robin Appelman [Thu, 19 Sep 2013 19:37:52 +0000 (21:37 +0200)]
clear permissions cache when scanning a file

11 years agoRemove duplicate method definitions
Thomas Tanghus [Mon, 23 Sep 2013 22:12:23 +0000 (00:12 +0200)]
Remove duplicate method definitions

11 years agoMerge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_m...
Thomas Tanghus [Mon, 23 Sep 2013 22:09:21 +0000 (00:09 +0200)]
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
lib/public/iservercontainer.php
lib/server.php

11 years agoDon't try to be clever
Thomas Tanghus [Wed, 18 Sep 2013 12:25:12 +0000 (14:25 +0200)]
Don't try to be clever

11 years agoAdd getUserFolder/getAppFolder to Server.
Thomas Tanghus [Wed, 18 Sep 2013 10:34:10 +0000 (12:34 +0200)]
Add getUserFolder/getAppFolder to Server.

11 years agoMerge pull request #4928 from owncloud/interfaces
Thomas Tanghus [Mon, 23 Sep 2013 21:08:22 +0000 (14:08 -0700)]
Merge pull request #4928 from owncloud/interfaces

Add a couple of interface definitions

11 years agoMerge pull request #4956 from owncloud/fix_not_displaying_emptycontent
Thomas Müller [Mon, 23 Sep 2013 20:09:47 +0000 (13:09 -0700)]
Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent

Fix not displaying "Upload something!" message

11 years agoFix not displaying "Upload something!" message
kondou [Mon, 23 Sep 2013 14:39:42 +0000 (16:39 +0200)]
Fix not displaying "Upload something!" message

Fix #4940

11 years agoMerge pull request #4869 from owncloud/fixing-4866-master
Thomas Müller [Mon, 23 Sep 2013 14:13:12 +0000 (07:13 -0700)]
Merge pull request #4869 from owncloud/fixing-4866-master

recreate an etag within the scanner if the cache contains an empty etag

11 years agoMerge pull request #4950 from owncloud/fix_preview_shared_folder
Thomas Müller [Mon, 23 Sep 2013 13:31:50 +0000 (06:31 -0700)]
Merge pull request #4950 from owncloud/fix_preview_shared_folder

Fix preview for shared folder and public upload

11 years agoMerge pull request #4856 from owncloud/fix-link-expiration
Andreas Fischer [Mon, 23 Sep 2013 13:12:38 +0000 (15:12 +0200)]
Merge pull request #4856 from owncloud/fix-link-expiration

Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

* owncloud/fix-link-expiration:
  Perform expiration date checking before returning share data for token.
  Tests whether expired/valid link share is still accessible.

11 years agoMove setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
Andreas Fischer [Mon, 23 Sep 2013 10:45:02 +0000 (12:45 +0200)]
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.

11 years agoMerge remote-tracking branch 'owncloud/master' into fixing-4866-master
Andreas Fischer [Mon, 23 Sep 2013 10:44:11 +0000 (12:44 +0200)]
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master

* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  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!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
tests/lib/files/cache/scanner.php

11 years agoimplement previews for public upload
Georg Ehrke [Mon, 23 Sep 2013 10:27:05 +0000 (12:27 +0200)]
implement previews for public upload

11 years agofix previews in shared folders
Georg Ehrke [Mon, 23 Sep 2013 08:26:46 +0000 (10:26 +0200)]
fix previews in shared folders

11 years agoMerge pull request #4896 from owncloud/sharing_allow_disable_password
Björn Schießle [Mon, 23 Sep 2013 08:20:09 +0000 (01:20 -0700)]
Merge pull request #4896 from owncloud/sharing_allow_disable_password

sharing, allow user to disable password protection

11 years agoMerge pull request #4327 from owncloud/scanfile-remove
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

11 years agoMerge pull request #4623 from owncloud/convert-oc_preferences
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

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 22 Sep 2013 16:58:42 +0000 (12:58 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #4929 from owncloud/fixing-4416-master
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

11 years agoMerge pull request #4938 from owncloud/scan-filter-outside-view
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...

11 years agofiles: when filtering search results, ensure results are children of the fakeroot...
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

11 years agoMerge pull request #4927 from owncloud/fix_namespaces_and_autoloading
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

11 years agoMove bool to int conversion to buildParts(), so it also happens for update().
Andreas Fischer [Sat, 21 Sep 2013 00:20:01 +0000 (02:20 +0200)]
Move bool to int conversion to buildParts(), so it also happens for update().

11 years agoDo not convert boolean to integer in tests. put() already does this.
Andreas Fischer [Fri, 20 Sep 2013 22:12:13 +0000 (00:12 +0200)]
Do not convert boolean to integer in tests. put() already does this.

11 years agoOnly update the etag. Do not re-submit any other unchanged data.
Andreas Fischer [Fri, 20 Sep 2013 21:53:02 +0000 (23:53 +0200)]
Only update the etag. Do not re-submit any other unchanged data.

11 years agoUse update() instead of put().
Andreas Fischer [Fri, 20 Sep 2013 21:52:05 +0000 (23:52 +0200)]
Use update() instead of put().

11 years agoAdd missing implements and fix parameters in IConfig
Bart Visscher [Fri, 20 Sep 2013 20:45:22 +0000 (22:45 +0200)]
Add missing implements and fix parameters in IConfig

11 years agoPHPDoc & get UserManager from container for RooFolder
Thomas Müller [Fri, 20 Sep 2013 19:57:48 +0000 (21:57 +0200)]
PHPDoc & get UserManager from container for RooFolder

11 years agofixing typos + adding missing filed $activeEntry
Thomas Müller [Fri, 20 Sep 2013 19:45:27 +0000 (21:45 +0200)]
fixing typos + adding missing filed $activeEntry

11 years agofixing PHPDoc
Thomas Müller [Fri, 20 Sep 2013 19:43:17 +0000 (21:43 +0200)]
fixing PHPDoc

11 years agofixing typos
Thomas Müller [Fri, 20 Sep 2013 19:40:54 +0000 (21:40 +0200)]
fixing typos

11 years agosetting a default on filecache column unencrypted_size
Thomas Müller [Fri, 20 Sep 2013 18:47:24 +0000 (20:47 +0200)]
setting a default on filecache column unencrypted_size

11 years agowhen storing back the data field 'encrypted' it is necessary to cast the boolean...
Thomas Müller [Fri, 20 Sep 2013 18:34:17 +0000 (20:34 +0200)]
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy

11 years agoFix the apps enabling/disabling in settings
Bart Visscher [Fri, 20 Sep 2013 18:29:15 +0000 (20:29 +0200)]
Fix the apps enabling/disabling in settings

11 years agoAdd Config container class to server container
Bart Visscher [Fri, 20 Sep 2013 18:21:24 +0000 (20:21 +0200)]
Add Config container class to server container

11 years agoAdd Navigation class to server container
Bart Visscher [Fri, 20 Sep 2013 15:34:33 +0000 (17:34 +0200)]
Add Navigation class to server container

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 20 Sep 2013 14:50:14 +0000 (10:50 -0400)]
[tx-robot] updated from transifex

11 years agoremove unneccessary lib in namespace
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:46:33 +0000 (16:46 +0200)]
remove unneccessary lib in namespace

11 years agonamespaces use upcasefirst parts
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!

11 years agoinitialize variable
Bjoern Schiessle [Fri, 20 Sep 2013 13:47:33 +0000 (15:47 +0200)]
initialize variable

11 years agoAdd DBConnection to server container
Bart Visscher [Fri, 20 Sep 2013 12:33:45 +0000 (14:33 +0200)]
Add DBConnection to server container

11 years agoAdd UserSession to server container
Bart Visscher [Fri, 20 Sep 2013 10:45:56 +0000 (12:45 +0200)]
Add UserSession to server container

11 years agocalculate correct permissions while toggle the password protection
Bjoern Schiessle [Fri, 20 Sep 2013 11:11:05 +0000 (13:11 +0200)]
calculate correct permissions while toggle the password protection

11 years agomake sure that both $permissions and $oldPermissions have the same type
Bjoern Schiessle [Fri, 20 Sep 2013 10:40:21 +0000 (12:40 +0200)]
make sure that both $permissions and $oldPermissions have the same type

11 years agoMerge pull request #4684 from owncloud/improved-console
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

11 years agoMerge pull request #4908 from owncloud/fix_css_selector
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 []

11 years agoAdd copyright, remove starting blank line
Bart Visscher [Thu, 19 Sep 2013 17:12:16 +0000 (19:12 +0200)]
Add copyright, remove starting blank line

11 years agoupdate inherit docs comment
Bart Visscher [Wed, 18 Sep 2013 14:38:59 +0000 (16:38 +0200)]
update inherit docs comment

11 years agoFix insert/update/delete helper functions for oracle
Bart Visscher [Sun, 1 Sep 2013 10:35:20 +0000 (12:35 +0200)]
Fix insert/update/delete helper functions for oracle

11 years agoAdd missing return true statements to legacy preferences functions
Bart Visscher [Sat, 31 Aug 2013 13:52:11 +0000 (15:52 +0200)]
Add missing return true statements to legacy preferences functions

11 years agoAdd missing static
Bart Visscher [Sat, 31 Aug 2013 13:50:47 +0000 (15:50 +0200)]
Add missing static

11 years agoConvert OC_Preference to object interface
Bart Visscher [Sun, 3 Mar 2013 11:04:29 +0000 (12:04 +0100)]
Convert OC_Preference to object interface

11 years agoMerge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
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

11 years agoMerge branch 'master' into fix_3728_with_file_exists_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

11 years agoMerge pull request #4900 from owncloud/fixing-4488-master
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

11 years agoMerge pull request #4263 from owncloud/search_scrollto
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

11 years agofix race condition in lazy preview loading
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 12:46:33 +0000 (14:46 +0200)]
fix race condition in lazy preview loading

11 years agoFix syntax error
Thomas Tanghus [Thu, 19 Sep 2013 11:27:41 +0000 (13:27 +0200)]
Fix syntax error

11 years agoMerge branch 'appframework-master' into server_folder_methods
Thomas Tanghus [Thu, 19 Sep 2013 10:32:32 +0000 (12:32 +0200)]
Merge branch 'appframework-master' into server_folder_methods

11 years agouse {count} instead of 'One' for more versatile translation
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 10:05:30 +0000 (12:05 +0200)]
use {count} instead of 'One' for more versatile translation

11 years agoMerge branch 'master' into fixing-4488-master
Thomas Müller [Thu, 19 Sep 2013 09:43:38 +0000 (11:43 +0200)]
Merge branch 'master' into fixing-4488-master

11 years agoMerge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into...
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

11 years agofix double translation of error message
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:32:56 +0000 (11:32 +0200)]
fix double translation of error message

11 years agouse n to translate title
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:25:41 +0000 (11:25 +0200)]
use n to translate title

11 years agoMerge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into...
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

11 years agofixing typos and l10n
Thomas Müller [Thu, 19 Sep 2013 09:13:11 +0000 (11:13 +0200)]
fixing typos and l10n

11 years agojsdoc types should go into {}
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:11:22 +0000 (11:11 +0200)]
jsdoc types should go into {}

11 years agocss selectors never have a : before []
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 08:14:07 +0000 (10:14 +0200)]
css selectors never have a : before []

11 years agouse 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe...
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

11 years agofix 'event is not defined' error
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 07:47:51 +0000 (09:47 +0200)]
fix 'event is not defined' error

11 years agoMerge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master
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?

11 years agofixing 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?

11 years agoadding comma to get cleaner diffs in the future
Thomas Müller [Wed, 18 Sep 2013 21:42:36 +0000 (23:42 +0200)]
adding comma to get cleaner diffs in the future

11 years agono file actions during upload
Thomas Müller [Wed, 18 Sep 2013 21:06:48 +0000 (23:06 +0200)]
no file actions during upload

11 years agoMerge pull request #4886 from owncloud/public_cache
Thomas Müller [Wed, 18 Sep 2013 20:29:35 +0000 (13:29 -0700)]
Merge pull request #4886 from owncloud/public_cache

Public cache etc.

11 years agoupdating php docs
Thomas Müller [Wed, 18 Sep 2013 20:22:51 +0000 (22:22 +0200)]
updating php docs

11 years agoindentation
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:58:15 +0000 (17:58 +0200)]
indentation

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 18 Sep 2013 15:50:02 +0000 (11:50 -0400)]
[tx-robot] updated from transifex

11 years agosimplify conflict template handling, fix reopen after ESC
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:22:29 +0000 (17:22 +0200)]
simplify conflict template handling, fix reopen after ESC

11 years agomove upload dialog css to separate file
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:20:14 +0000 (17:20 +0200)]
move upload dialog css to separate file

11 years agoallow passing classes to buttons
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 15:13:07 +0000 (17:13 +0200)]
allow passing classes to buttons

11 years agoMerge pull request #4745 from owncloud/split_personal-user_passwordchange
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

11 years agoTranslate errormsgs in settings/changepassword/controller
kondou [Wed, 18 Sep 2013 14:47:27 +0000 (16:47 +0200)]
Translate errormsgs in settings/changepassword/controller

11 years agoNote to self 2: Do as you preach. Test!
Thomas Tanghus [Wed, 18 Sep 2013 13:02:25 +0000 (15:02 +0200)]
Note to self 2: Do as you preach. Test!

11 years agoNote to self: Test before pushing!!!
Thomas Tanghus [Wed, 18 Sep 2013 12:50:21 +0000 (14:50 +0200)]
Note to self: Test before pushing!!!

11 years agohide excessive logging with a trace flag
Jörn Friedrich Dreyer [Wed, 18 Sep 2013 12:39:39 +0000 (14:39 +0200)]
hide excessive logging with a trace flag

11 years agoDon't try to be clever
Thomas Tanghus [Wed, 18 Sep 2013 12:25:12 +0000 (14:25 +0200)]
Don't try to be clever

11 years agoMerge branch 'master' into fix_3728_with_file_exists_dialog
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

11 years agoMerge branch 'master' into fix_3728_with_file_exists_dialog
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