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

7610 commits

Author SHA1 Message Date
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