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

7844 commits

Author SHA1 Message Date
Lukas Reschke
5b8a6b66b5 Load PHPAss via autoloader 2014-11-06 16:32:53 +01:00
Lukas Reschke
8f1fa32e1f Merge pull request #11998 from owncloud/add-get-logger-to-interface 
Add getLogger() to IServerContainer
 2014-11-06 16:04:54 +01:00
Lukas Reschke
c4d7483a0a Use new hashing API for OC_User_Database 
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
 2014-11-06 15:42:06 +01:00
Lukas Reschke
24ca2d858f Add OCP\Security\IHasher 
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.

Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
 2014-11-06 15:16:14 +01:00
Lukas Reschke
5f2a083686 Merge pull request #11883 from owncloud/clear-session-for-setup 
Clear session before setup
 2014-11-06 14:39:51 +01:00
Lukas Reschke
f73d653036 Merge pull request #11972 from owncloud/usermanager-remove-delete 
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
 2014-11-06 13:52:25 +01:00
Lukas Reschke
0e3e1e3563 Add getLogger() to IServerContainer 
Makes my IDE complaining less ;-)
 2014-11-06 13:36:36 +01:00
Morris Jobke
73569b29bc md5 now handled via bower 2014-11-06 13:22:16 +01:00
Morris Jobke
e49b9022a1 bower snapjs 2014-11-06 12:03:57 +01:00
Vincent Petry
afa14d571c Merge pull request #11982 from owncloud/bower-underscore 
bower underscore
 2014-11-06 08:42:29 +01:00
Jenkins for ownCloud
fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Morris Jobke
957dee5af1 bower underscore 2014-11-05 23:23:03 +01:00
Lukas Reschke
4659b0e6a0 Merge pull request #11936 from owncloud/bower-jquery 
Bower jquery
 2014-11-05 16:43:24 +01:00
Robin Appelman
1eefc21329 Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead 2014-11-05 15:45:58 +01:00
Thomas Müller
e624e9064c Merge pull request #11965 from owncloud/fix-jsonresponse 
fix typo in content type for JSONResponse
 2014-11-05 14:03:12 +01:00
Thomas Müller
06267fec8f Merge pull request #11928 from owncloud/support-HTML-in-logo 
Support HTML in logo
 2014-11-05 13:54:29 +01:00
Bjoern Schiessle
c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Bernhard Posselt
91a23bfa9c fix typo in content type 2014-11-05 12:04:56 +01:00
Jenkins for ownCloud
c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Morris Jobke
74d375d8ea migrate jQuery to bower 2014-11-04 14:28:29 +01:00
Morris Jobke
7f4e447a5f fix shortcuts - underline instead of camelCase 2014-11-04 13:57:38 +01:00
Morris Jobke
fde8ef0655 Merge pull request #11916 from owncloud/introduce-bower 
Introduce bower dependency managment for frontend libraries
 2014-11-04 11:59:33 +01:00
Jenkins for ownCloud
287faf9923 [tx-robot] updated from transifex 2014-11-04 01:55:05 -05:00
Morris Jobke
7f1d974796 Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig 
First check whether it is the default config before touching
 2014-11-03 21:20:42 +01:00
Lukas Reschke
be5ae6c44f Support HTML in logo claim 2014-11-03 21:14:27 +01:00
Morris Jobke
1a405e56f5 replace moment.js with bower version 
* fix JS unit tests
 2014-11-03 20:54:50 +01:00
Morris Jobke
d763b32048 ability to add bower resources 
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
 2014-11-03 20:54:40 +01:00
Thomas Müller
994768d99f Update Pimple to V3.0 2014-11-03 16:57:16 +01:00
Lukas Reschke
e73ccbd4ca Migrate "setsecurity.php" to the AppFramework 
Add switch to enforce SSL for subdomains

Add unit tests

Add test for boolean values

Camel-case

Fix ugly JS
 2014-11-03 16:53:03 +01:00
Lukas Reschke
9790801268 First check whether it is the default config before touchign 
Potentially fixes https://github.com/owncloud/core/issues/11678
 2014-11-03 16:37:04 +01:00
Thomas Müller
a4f0483f56 Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 2014-11-03 13:52:47 +01:00
Morris Jobke
56cf1d9d27 fix odd behaviour 2014-10-31 18:46:47 +01:00
Vincent Petry
fd4b97d758 Merge pull request #9044 from owncloud/add-missing-email-principal 
adding missing email address for principal
 2014-10-31 13:24:42 +01:00
Lukas Reschke
d30fd23544 Clear session before setup 
Fixes https://github.com/owncloud/core/issues/11861
 2014-10-31 11:21:00 +01:00
Vincent Petry
55658e7bb2 Merge pull request #11539 from owncloud/mount-setup-once 
Only mount the storages for the user once
 2014-10-31 10:42:29 +01:00
Jenkins for ownCloud
e00f25e5b0 [tx-robot] updated from transifex 2014-10-31 01:55:39 -04:00
Morris Jobke
1c7f1a8787 Merge pull request #11877 from owncloud/fix-11875-master 
prevent PHP notice
 2014-10-30 21:43:38 +01:00
Vincent Petry
bed81ea854 Merge pull request #11080 from owncloud/addheader-text-2 
Fix the addHeader tag attributes text methods to not ignore the text parameter
 2014-10-30 18:13:46 +01:00
Thomas Müller
99921489cf prevent PHP notice 2014-10-30 17:24:25 +01:00
Georg Ehrke
33186957c8 delete all children's previews when deleting a folder 
add phpdoc
 2014-10-30 17:15:42 +01:00
Thomas Müller
9b293537a6 Merge pull request #11740 from owncloud/update-archive-tar 
Update pear/archive_tar to 1.3.13
 2014-10-30 17:14:07 +01:00
Lukas Reschke
6db69c5d05 Merge pull request #11864 from owncloud/clear-session-after-logout 
Clear session after logout
 2014-10-30 16:47:46 +01:00
Morris Jobke
90e523ead0 Merge pull request #11858 from owncloud/fix-11064 
Allow any outgoing XHR connections
 2014-10-30 16:19:39 +01:00
Thomas Müller
08b46ccc17 Update pear/archive_tar to 1.3.13 2014-10-30 16:10:00 +01:00
Thomas Müller
18f7f582ac Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro 
Fix stupid copy paste fail
 2014-10-30 14:45:58 +01:00
Morris Jobke
e2001c6d31 Merge pull request #11821 from owncloud/generic-response 
Add a generic data response
 2014-10-30 14:05:25 +01:00
Lukas Reschke
770c62c5d8 Clear session after logout 
Fixes https://github.com/owncloud/core/issues/8420
 2014-10-30 12:10:39 +01:00
Lukas Reschke
e219d72619 Fix stupid copy paste fail 
...
 2014-10-30 10:37:59 +01:00
Jenkins for ownCloud
ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Lukas Reschke
b3f881748d Allow any outgoing XHR connections 
Quickfix for https://github.com/owncloud/core/issues/11064
 2014-10-30 00:00:40 +01:00
Vincent Petry
106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse 
Pass the cached data to the filesystem watcher
 2014-10-29 16:38:16 +01:00
Thomas Müller
105940b9dc Merge pull request #11638 from owncloud/oc8-translations 
[OC8] Load javascript translations using standard web technologies
 2014-10-29 13:09:02 +01:00
Thomas Müller
c353cbe633 Merge pull request #11689 from owncloud/doctrine-2.5 
Update doctrine/dbal to 2.5
 2014-10-29 11:34:23 +01:00
Thomas Müller
fb4f993336 Fix implementation of translation short cut 2014-10-29 10:58:10 +01:00
Vincent Petry
c682b1f0c1 Fix language file detection 2014-10-29 10:13:51 +01:00
Thomas Müller
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Thomas Müller
2f19de11e4 adding console command to generate javascript translation files based on existing php translation files 
read server side translations from json files
 2014-10-29 10:09:12 +01:00
Vincent Petry
d71cd680dd Include core translations 
Moved search result type translations to search.js

Load JS translations earlier

Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.

This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
 2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78 in case a translation javascript is not found we no longer bail out 
remove translation.php
 2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions 
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
 2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad add dataresponse 
fix docstrings

adjust copyright date

another copyright date update

another header update

implement third headers argument, fix indention, fix docstrings

fix docstrings
 2014-10-29 09:43:47 +01:00
Jenkins for ownCloud
cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
Thomas Müller
46c2909c78 Update doctrine/dbal to 2.5 2014-10-28 15:39:37 +01:00
Robin Appelman
2974d4d380 Reset the users setup after clearing mounts 2014-10-28 15:13:29 +01:00
Thomas Müller
c93ddf77b9 Use composer autoloader to load Patchwork 2014-10-28 13:42:28 +01:00
Adam Williamson
0e3f2055d2 use Composer autoloader not OC for non-Composer 3rdparty (#9643) 
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.

With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.

Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.

drop unneeded registerPrefix() and registerClass() from autoloader

Now we're not handling anything but OC's own classes, these are
unnecessary.

error out if composer autoloader is not found (thanks bantu)

We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
 2014-10-28 11:32:20 +01:00
Lukas Reschke
510d0b2cf3 Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter 
Also support closing tags with no text content given

Conflicts:
	lib/private/template.php
 2014-10-28 11:15:58 +01:00
Morris Jobke
4461e69873 Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling 
Properly catch 503 storage not available in getQuotaInfo
 2014-10-28 09:33:54 +01:00
Jenkins for ownCloud
23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04:00
Lukas Reschke
d6380a5395 Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable 
Make supported DBs configurable within config.php
 2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51 code cleanup during review 👍 2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9 Make supported DBs configurable within config.php 
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".
 2014-10-27 21:39:34 +01:00
Robin Appelman
3f63f4b6b1 Only mount the storages for the user once 2014-10-27 18:50:28 +01:00
Vincent Petry
21d825ed6c Properly catch 503 storage not available in getQuotaInfo 
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.
 2014-10-27 16:27:12 +01:00
Morris Jobke
a00712aa65 Merge pull request #11783 from owncloud/allow_passing_driver_options 
allow passing db driver options
 2014-10-27 16:00:13 +01:00
Robin Appelman
8de287f2ef Merge pull request #11763 from owncloud/stable-etags 
Generate stable etags for local files
 2014-10-27 15:30:30 +01:00
Morris Jobke
290e9cd5b2 Merge pull request #11787 from owncloud/fix-php-docs 
Fix PHPDoc
 2014-10-27 14:46:41 +01:00
Lukas Reschke
f7c393fa9f Fix PHPDoc 
Stop my IDE and Scrutinizer from complaining.
 2014-10-27 13:38:40 +01:00
Jörn Friedrich Dreyer
e16a58220d allow passing driver options, fixes #11718 2014-10-27 12:30:29 +01:00
Vincent Petry
aee1edf6b5 Merge pull request #11708 from owncloud/fix-momentjs 
Setting moment locale based on user selection
 2014-10-27 10:30:47 +01:00
Jenkins for ownCloud
5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Lukas Reschke
acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible 
Add type hinting to functions
 2014-10-25 14:09:48 +02:00
Morris Jobke
be32e562e3 drop unneeded hint 2014-10-25 12:00:56 +02:00
Jenkins for ownCloud
3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04:00
Morris Jobke
63f2b1f460 Merge pull request #11767 from danbartram/add_db_rollback 
Add missing DB rollback functionality
 2014-10-24 19:52:56 +02:00
Thomas Müller
9fa5483111 Merge pull request #11709 from owncloud/temp-handling 
Cleanup handling of temporary files
 2014-10-24 19:29:05 +02:00
Dan Bartram
9c1015b790 Add missing DB rollback functionality 2014-10-24 17:44:06 +01:00
Robin Appelman
283c10f010 Generate stable etags for local files 2014-10-24 16:47:58 +02:00
Lukas Reschke
f901c5ff08 Fix PHPDoc and remove explicit type hint 2014-10-24 15:49:55 +02:00
Lukas Reschke
b3a04840b5 Add type hinting to functions 
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
 2014-10-24 14:13:40 +02:00
Robin Appelman
16cfca6a5f Better reuse of cache data for getFolderContents 2014-10-24 12:33:54 +02:00
Robin Appelman
0a3f57f832 Pass the cached data to the filesystem watcher 2014-10-24 12:32:55 +02:00
Lukas Reschke
d060180140 Use function outside of loop 
Otherwise the function is executed n times which is a lot of overhead
 2014-10-24 12:27:53 +02:00
Robin Appelman
0b96297783 Use the TempManager to handle temporary files 2014-10-24 12:18:49 +02:00
Robin Appelman
83c74b80ad Add \OC\TempManager to handle creating and cleaning temporary files 2014-10-24 12:18:46 +02:00
Lukas Reschke
2d2a4741ce Make files non executable 
There is not much sense in having these files marked executable, we should avoid that.
 2014-10-24 11:14:51 +02:00
libasys
cbd130bed0 adding missing email address for principal 
* fix #8515
* add mail only if it exists
 2014-10-24 11:12:23 +02:00
Jenkins for ownCloud
9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Morris Jobke
4b5a3876ac Merge pull request #7749 from owncloud/load_avatar_header_via_php 
Load avatar in header via PHP
 2014-10-24 01:27:25 +02:00
kondou
729dffed5e Load avatar in header via PHP 
* fix #7484
* use UID, css, and div instead of span
 2014-10-23 23:17:18 +02:00
Lukas Reschke
c30b7f8197 Remove unreachable statement 2014-10-23 23:03:14 +02:00
Clark Tomlinson
ca5abe5744 Setting moment locale based on user selection 2014-10-23 10:32:47 -04:00
Thomas Müller
e26a16afea Merge pull request #11549 from owncloud/add-more-localizations-master 
implement localizations based on punic
 2014-10-23 16:09:47 +02:00
Thomas Müller
6c1871da06 Merge pull request #10985 from owncloud/db-cleanup 
Cleanup database handling
 2014-10-23 13:48:33 +02:00
Morris Jobke
b82e44b448 Merge pull request #10689 from owncloud/load_classfile_once 
make sure class file is loaded once
 2014-10-23 11:41:00 +02:00
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Lukas Reschke
e9ec45ddd1 Merge pull request #11704 from owncloud/fix-type-for-query 
Use mixed as type
 2014-10-22 18:13:31 +02:00
blizzz
44a7a3690a Merge pull request #11702 from owncloud/fix-11637 
setup filesystem by username, not login name, fixes #11637
 2014-10-22 17:56:30 +02:00
Lukas Reschke
be06937e65 Use mixed as type 
Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.
 2014-10-22 15:09:33 +02:00
Jörn Friedrich Dreyer
b7fa644a54 Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master 
Special treatment for Oracle
 2014-10-22 14:54:42 +02:00
Lukas Reschke
31e489b44d Merge pull request #11687 from owncloud/appframework-session-annotation 
introduce SessionMiddleWare to control session handling via an annotatio...
 2014-10-22 14:45:28 +02:00
Arthur Schiwon
993376fb6f better variable name 2014-10-22 13:36:57 +02:00
Arthur Schiwon
e0342db47c set up FS by username, not login name\! 2014-10-22 13:28:08 +02:00
Thomas Müller
02c5933af8 introduce SessionMiddleWare to control session handling via an annotation 2014-10-22 12:44:19 +02:00
Robin Appelman
d83b11d34a Use statements wrapper in \OCP\IDB 2014-10-22 12:29:53 +02:00
Robin Appelman
e6f6cdd19f Bit more cleanup 2014-10-22 12:29:53 +02:00
Robin Appelman
2ae6a0d96d Move creating the database connection to the server container 2014-10-22 12:29:53 +02:00
Robin Appelman
d4e929c37a Remove implicit prepared statement cache and get the connection from the server container in \OC_DB 2014-10-22 12:26:43 +02:00
Robin Appelman
97a6f5c46b Extend \OCP\IDBConnection to cover more use cases 2014-10-22 12:26:43 +02:00
Robin Appelman
72f99f5041 Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead 2014-10-22 12:26:43 +02:00
Bjoern Schiessle
b7718bc212 always use the correct share type 2014-10-22 11:48:29 +02:00
Morris Jobke
e2ff180521 Merge pull request #11416 from owncloud/eventlogger 
Allow apps to gather performance diagnistics
 2014-10-22 11:18:26 +02:00
Jenkins for ownCloud
916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Thomas Müller
2814a294c8 call initPaths() right before the server is instantiated 2014-10-21 14:10:57 +02:00
Lukas Reschke
cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy 
remove legacy class OC_Updater
 2014-10-21 14:01:49 +02:00
Jenkins for ownCloud
8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
Lukas Reschke
8f8abdbaee Add unit tests for convertToRelativePath 2014-10-20 15:09:43 +02:00
Lukas Reschke
7b94c7f9c1 Refer to relative path instead of absolute path 
There is no need to refer to the absolute path here if we can use the relative one.

Conflicts:
	lib/private/templatelayout.php
 2014-10-20 15:09:43 +02:00
Thomas Müller
c8e8945efb implement localizations based on punic 2014-10-20 15:04:42 +02:00
Thomas Müller
d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Thomas Müller
6af0e76a03 remove legacy class OC_Updater 2014-10-20 14:44:42 +02:00
Robin Appelman
9fd234f63f Log some additional events 2014-10-20 13:38:38 +02:00
Robin Appelman
beb1c6ad74 Allow adding events that hapend before the event logger was loaded 2014-10-20 13:38:38 +02:00
Robin Appelman
4a8358bc50 Rename to NullQueryLogger 2014-10-20 13:38:38 +02:00
Robin Appelman
1e69f5e7ac Log some basic events 2014-10-20 13:38:38 +02:00
Robin Appelman
6e08014781 Rename namespace to Diagnostics 2014-10-20 13:38:38 +02:00
Robin Appelman
2790bda4f8 Activate the query logger on connect 2014-10-20 13:38:37 +02:00
Robin Appelman
b71d1d3616 Add QueryLogger interface to allow apps to get a list of used queries 2014-10-20 13:38:37 +02:00
Robin Appelman
d38050cf52 Add an EventLogger interface to allow apps to get a log of the request timeline 2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer
ca0e3fdfea throw exception in writeBack, the returned boolean is checked nowhere 2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5 make skeleton compatible with objectstore 
suspend encryption proxy when copying skeleton
 2014-10-20 11:28:36 +02:00
Jenkins for ownCloud
87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Arthur Schiwon
4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon
a7a532f58a with several backends, more than limit can be returned 2014-10-17 20:16:04 +02:00
Morris Jobke
7bf401e48a Merge pull request #11430 from owncloud/minify-js-css-master 
adding cssmin and jssmin(minify)
 2014-10-17 15:05:59 +02:00
Lukas Reschke
439b33ec38 Merge pull request #11634 from owncloud/loadapps-encapsulaterequire 
Encapsulate require_once to avoid name space bleedind
 2014-10-17 14:32:10 +02:00
Vincent Petry
27c22f071d Encapsulate require_once to avoid name space bleedind 
The script required by require_once might use variable names like $app
which will conflict with the code that follows.

This fix encapsulates require_once into its own function to avoid such
issues.
 2014-10-17 12:45:45 +02:00
Thomas Müller
93b0f1a3bf adding cssmin and jssmin(minify) 
adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content

adding repair step to clean the asset cache after upgrade + coding style adjustments
 2014-10-17 12:22:26 +02:00
blizzz
688a141586 Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup 
drastic ldap speedup (update)
 2014-10-17 12:07:27 +02:00
Morris Jobke
f1a5ebd59d Merge pull request #11611 from owncloud/fix-svg-master 
Fix SVG icons
 2014-10-17 12:01:27 +02:00
Lukas Reschke
af335a39f1 Add PHPDoc about sanitization of "insertIfNotExist" 
Let's document this potential pitfall properly.
 2014-10-17 11:06:49 +02:00
Jenkins for ownCloud
92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04:00
Lukas Reschke
53e0cf2f74 Add a try catch block 
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
 2014-10-16 21:45:09 +02:00
Thomas Müller
f7097faf82 Special treatment for Oracle 2014-10-16 17:02:15 +02:00
Lukas Reschke
a37dcf94fd Merge pull request #11591 from owncloud/addAppVersionToCSSandJS 
Add app version to JS and CSS
 2014-10-16 15:54:57 +02:00
Lukas Reschke
5f3ddf5c80 Merge pull request #11383 from ockham/share-tags2 
Share tags
 2014-10-16 15:36:04 +02:00
Thomas Müller
a04159090f include the apps' versions hash to invalidate the cached assets 2014-10-16 13:29:51 +02:00
Lukas Reschke
4deb57bfae Remove insane comment 2014-10-16 12:42:00 +02:00
Lukas Reschke
9cfbf7ed1c Fix SVG icons 
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
 2014-10-16 12:35:51 +02:00
blizzz
756f64d728 Merge pull request #11595 from owncloud/make_get_display_name_more_robust 
strip whitespace from the beginning and end of the display name
 2014-10-16 11:33:12 +02:00
Jörn Friedrich Dreyer
0254a3c406 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-16 10:15:43 +02:00
Jenkins for ownCloud
c8d8578d1a [tx-robot] updated from transifex 2014-10-16 01:56:30 -04:00
Lukas Reschke
63e0599218 Merge pull request #11565 from owncloud/fix-behaviourOnOSX 
Add darwin to if block
 2014-10-15 21:12:50 +02:00
Lukas Reschke
f82b996f57 Merge pull request #11528 from owncloud/use-raw-url 
Use `rawurlencode` since this seems to be expected by cURL
 2014-10-15 19:58:27 +02:00
Jörn Friedrich Dreyer
c27fd94ec8 in cli mode return true for isHtaccessWorking 2014-10-15 16:59:28 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
 2014-10-15 15:21:40 +02:00
Bjoern Schiessle
239bff5766 strip whitespace from the beginning and end of the display name to avoid empty display names 2014-10-15 14:54:35 +02:00
Vincent Petry
6824a5ce7f Merge pull request #11538 from owncloud/webdav-creatable-info 
Use the cached fileinfo to get creatable permissions
 2014-10-15 14:39:07 +02:00
Lukas Reschke
6ccda2ae98 Add app version to JS and CSS 
This leads to the regeneration of the hash in case a single application is updated.

Fixes https://github.com/owncloud/core/issues/11374
 2014-10-15 14:00:20 +02:00
Vincent Petry
6fa03870e9 Merge pull request #11541 from owncloud/usersession-activeuser-setsession 
Unset the cached active user when using a different session object
 2014-10-15 13:31:05 +02:00
Vincent Petry
4650101674 Merge pull request #11548 from owncloud/extstorage-ocfields 
Allow specifying protocol in ext storage OC config
 2014-10-15 13:27:23 +02:00
Lukas Reschke
1b3feb710d Use rawurlencode since this seems to be expected by cURL 
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
 2014-10-14 13:16:23 +02:00
Lukas Reschke
bf84cd4bcc Add darwin to if block 
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
 2014-10-14 12:58:00 +02:00
Joas Schilling
0407bc0978 Set overwritemailurl* configs on setup 
Correctly use overwritemailurl value when generating absolute urls in CLI

Fix #11500

Rename the config to *cli

Add overwrite.cli.url to the sample config

Revert separator fix, fixes unit test
 2014-10-14 05:07:09 +02:00
Bernhard Reiter
b416f7d8ac PHPDoc fixes as suggested by @MorrisJobke. 2014-10-14 00:06:33 +02:00
Bernhard Reiter
1770179648 Add getTag() function for accessing of a single tag. 2014-10-14 00:06:33 +02:00
Bernhard Reiter
bc265e8b52 Make loading of tags from DB more explicit. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
226d7233e1 In Tags::rename($from, $to), check if there already is a tag named $to. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
7e9baafc53 Add option to include tags for shared items. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
7963125c41 Remove two obsolete try...catch blocks. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
5471189fe6 Implement Tag and TagMapper classes. 
Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
 2014-10-14 00:06:07 +02:00
Bernhard Reiter
cf6fb2c2e4 Remove redundant null initializations. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
3e5d725502 Test addMultiple() with $sync=true. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
b33cb0e342 Fix a comment. 2014-10-14 00:06:07 +02:00
Vincent Petry
e95372bf01 Merge pull request #11546 from owncloud/users-deletewithfilecache 
Retrieve storage numeric id earlier when still available
 2014-10-13 17:27:13 +02:00
Vincent Petry
ab5149f5df Allow specifying protocol in ext storage OC config 
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
 2014-10-13 17:15:58 +02:00
Vincent Petry
d485c0098d Retrieve storage numeric id earlier when still available 
The numeric id is only available before the storage entry is deleted, so
get it at that time.
 2014-10-13 15:52:48 +02:00
Bjoern Schiessle
c6c9a51b11 distinguish between file dependent shares and other shares 2014-10-13 15:04:54 +02:00
Robin Appelman
912fbfab01 Unset the cached active user when using a different session object 2014-10-13 13:11:48 +02:00
Robin Appelman
19de425a50 Use the cached fileinfo to get creatable permissions 2014-10-13 13:09:05 +02:00
Lukas Reschke
bf674487aa Merge pull request #11367 from owncloud/removeIsMimeSupported 
Remove uneeded slicing of element
 2014-10-12 19:45:00 +02:00
Jenkins for ownCloud
a3635fedbb [tx-robot] updated from transifex 2014-10-12 01:54:39 -04:00
Björn Schießle
87899db204 Merge pull request #11380 from owncloud/fix_performance_issue_sharing 
[sharing] fix performance issues
 2014-10-10 15:56:30 +02:00
Bjoern Schiessle
3431d547a9 fix performance issues 2014-10-10 12:16:26 +02:00
Vincent Petry
660e9c4012 Merge pull request #11501 from Ansud/master 
Urlencode file name before passing it to cURL
 2014-10-10 10:57:59 +02:00
Jenkins for ownCloud
2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Vincent Petry
9dea79e341 Merge pull request #11305 from owncloud/ext-updateetagonmount 
Update etag of parent dir when adding/removing ext storage mount points
 2014-10-09 18:18:36 +02:00
Vincent Petry
c82e310e20 Merge pull request #11495 from owncloud/apps-clearenableappscacheafterloadingauthapp 
Clear enabled apps cache after loading authentication app
 2014-10-09 17:20:05 +02:00
Lukas Reschke
16cd749065 Add support for keys in the info.xml 
This allows to have links to different doc base URLs

a.
 2014-10-09 15:48:30 +02:00
Tony Zelenoff
2d03019c91 Urlencode file name before passing it to cURL 
Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.

Signed-off-by: Tony Zelenoff <antonz@parallels.com>
 2014-10-09 17:15:12 +04:00
Vincent Petry
36d22825e0 Clear enabled apps cache after loading authentication app 
Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.
 2014-10-09 14:34:41 +02:00
Jenkins for ownCloud
295c46ccb5 [tx-robot] updated from transifex 2014-10-09 01:55:33 -04:00
Jörn Friedrich Dreyer
3427976bb6 strict comparison 2014-10-08 18:49:55 +02:00
Jörn Friedrich Dreyer
aa3ad898a9 fix amazon s3 issues 
folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo
 2014-10-08 18:49:47 +02:00
Robin Appelman
12ac3a800d Expose getAppKeys trough \OCP\IConfig 2014-10-08 14:22:17 +02:00
Vincent Petry
6585eaa5df Added failing unit tests for mount config hooks 2014-10-08 14:22:17 +02:00
michag86
8abe441d4a cleanup group admin(s) on deleteGroup 2014-10-08 14:05:06 +02:00
michag86
ca58ac50a2 fix for issue #10880 2014-10-07 16:07:48 +02:00
Vincent Petry
d7db006315 Revert "fix for issue #10880" 
This reverts commit 0df070a8e4.
 2014-10-07 15:54:25 +02:00
michag86
0df070a8e4 fix for issue #10880 2014-10-07 14:30:14 +02:00
Morris Jobke
6323d5fb3a Merge pull request #11437 from owncloud/add-import-filter 
Add CssImportFilter. More elegant fix for documents#348
 2014-10-07 08:28:08 +02:00
Jenkins for ownCloud
01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Victor Dubiniuk
b6087ea79b Add CssImportFilter. More elegant fix for documents#348 2014-10-06 19:39:02 +03:00
Morris Jobke
a6293a38f2 Merge pull request #11390 from Nemesiz/master 
Preview large TXT files fix
 2014-10-06 14:25:27 +02:00
Jenkins for ownCloud
6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Olivier Paroz
b0000800e1 New generic class for Imagemagick conversions 2014-10-04 17:50:12 +02:00
Nmz
83c2829ca8 Preview large TXT files fix 
Limit the size of the string generating the preview image for TXT files
 2014-10-02 12:47:39 +03:00
Jenkins for ownCloud
553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Lukas Reschke
e762ff2bbd Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain 
Redirect only to absolute URL
 2014-10-01 12:47:43 +02:00
Lukas Reschke
cbecd62287 Merge pull request #11303 from owncloud/addFilelockToConfig 
Add flock to config
 2014-10-01 10:43:18 +02:00
Morris Jobke
5beeb923e6 Merge pull request #11365 from owncloud/fix-phpdoc 
Fix PHPDoc
 2014-09-30 16:15:37 +02:00
Morris Jobke
e881be7926 Merge pull request #11366 from owncloud/invalid-doc 
Remove invalid PHPDoc
 2014-09-30 16:12:58 +02:00
Lukas Reschke
68cf6681e5 Add flock to config 
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070

Testplan:

- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation

Only skip the main config

Otherwise read only additional configs might not be processed

Test on tmpdir
 2014-09-30 15:53:27 +02:00
Lukas Reschke
96d9e0eb5b Remove uneeded slicing of element 
The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs.

Please notice that this is only relevant for master.
 2014-09-30 14:08:43 +02:00
Lukas Reschke
67f8875f47 Remove invalid PHPDoc 
Despite the documentation this function does not read values from the cookie
 2014-09-30 13:46:43 +02:00
Lukas Reschke
b4944ffcc5 Fix PHPDoc 2014-09-30 13:34:50 +02:00
Jenkins for ownCloud
5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Lukas Reschke
8c8e5c168e Merge pull request #10107 from owncloud/sharing_group_shares 
[sharing] group shares
 2014-09-29 20:26:41 +02:00
Lukas Reschke
41374986d3 Remove dead code 2014-09-29 17:20:29 +02:00
Lukas Reschke
6e7365fc17 Redirect only to absolute URL 
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
 2014-09-29 17:07:43 +02:00
Bjoern Schiessle
6e7acb8ae0 some small fixed, suggested by scrutinizer 2014-09-29 11:23:18 +02:00
Jenkins for ownCloud
63726ea9e2 [tx-robot] updated from transifex 2014-09-29 01:54:33 -04:00
Jenkins for ownCloud
84923475c0 [tx-robot] updated from transifex 2014-09-28 01:55:09 -04:00
Jenkins for ownCloud
3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Bjoern Schiessle
2a4da7fe09 on unshare only unshare childrens if there is no other parent available 2014-09-26 16:58:47 +02:00
Lukas Reschke
53f6d74938 Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master 
catch and log exception in OC_Helper::cleanTmp()
 2014-09-26 14:31:31 +02:00
Bjoern Schiessle
e115a7043f only create a new share entry, if the user needs a different target name than the group share 2014-09-26 13:19:15 +02:00
Bjoern Schiessle
ed85055d31 for group shares we don't need a extra db entry of groupTarget equals itemTarget 2014-09-26 13:10:31 +02:00
Bjoern Schiessle
d242e518f9 for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self 2014-09-26 13:01:54 +02:00
Thomas Müller
4c08215e66 catch and log exception in OC_Helper::cleanTmp() 2014-09-26 11:36:53 +02:00
Thomas Müller
e5a111b80e Merge pull request #11285 from owncloud/dav-permissions-create 
Fix dav permissions for folders
 2014-09-26 09:21:32 +02:00
Jenkins for ownCloud
1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Robin Appelman
6365c57b04 Merge pull request #11282 from owncloud/scanner-memory-stable7 
Don't keep the full info of all children in memory
 2014-09-25 15:53:33 +02:00
Vincent Petry
9fc23e1967 Merge pull request #10934 from owncloud/datadir-write-setup 
Don't complain about non-writable datadirs before we're installed
 2014-09-25 14:32:32 +02:00
Bjoern Schiessle
52b6469b0c call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-09-25 14:26:31 +02:00
Robin Appelman
10c350b895 Fix dav permissions for folders without create permissions 2014-09-25 14:01:19 +02:00
Robin Appelman
ccb4475a8d Expose creatable permissions trough fileinfo 2014-09-25 14:00:13 +02:00
Bjoern Schiessle
968152113e always select permissions, used in getItems() 2014-09-25 12:35:11 +02:00