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
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
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
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
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
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
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
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
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
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
Robin Appelman
2974d4d380
Reset the users setup after clearing mounts
2014-10-28 15:13:29 +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
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
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
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
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
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
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
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
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
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
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
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