]>
source.dussan.org Git - nextcloud-server.git/log
Jenkins for ownCloud [Sat, 18 Oct 2014 05:55:30 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
blizzz [Fri, 17 Oct 2014 21:57:00 +0000 (23:57 +0200)]
Merge pull request #11494 from owncloud/fix-ldap-ingroup-for-9225-2
fix retrieval of group members and cache group members
Arthur Schiwon [Fri, 17 Oct 2014 18:53:09 +0000 (20:53 +0200)]
adjust group manager tests
Arthur Schiwon [Thu, 16 Oct 2014 14:08:59 +0000 (16:08 +0200)]
add one simple cache test
Arthur Schiwon [Fri, 10 Oct 2014 19:29:11 +0000 (21:29 +0200)]
make performance less bad. Still far from good, but at least it works
Arthur Schiwon [Fri, 10 Oct 2014 16:58:39 +0000 (18:58 +0200)]
with several backends, more than limit can be returned
Arthur Schiwon [Thu, 18 Sep 2014 15:12:35 +0000 (17:12 +0200)]
fix retrievel of group members and cache group members
fix changed variable name
Morris Jobke [Fri, 17 Oct 2014 13:07:14 +0000 (15:07 +0200)]
update 3rdparty to match master - just adds the merge commit
Morris Jobke [Fri, 17 Oct 2014 13:05:59 +0000 (15:05 +0200)]
Merge pull request #11430 from owncloud/minify-js-css-master
adding cssmin and jssmin(minify)
Lukas Reschke [Fri, 17 Oct 2014 12:32:10 +0000 (14:32 +0200)]
Merge pull request #11634 from owncloud/loadapps-encapsulaterequire
Encapsulate require_once to avoid name space bleedind
Björn Schießle [Fri, 17 Oct 2014 12:18:59 +0000 (14:18 +0200)]
Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
fixing usage of EncryptionException
Vincent Petry [Fri, 17 Oct 2014 10:28:27 +0000 (12:28 +0200)]
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.
Thomas Müller [Mon, 6 Oct 2014 10:38:59 +0000 (12:38 +0200)]
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
blizzz [Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)]
Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup
drastic ldap speedup (update)
Morris Jobke [Fri, 17 Oct 2014 10:01:27 +0000 (12:01 +0200)]
Merge pull request #11611 from owncloud/fix-svg-master
Fix SVG icons
Thomas Müller [Fri, 17 Oct 2014 09:46:22 +0000 (11:46 +0200)]
fixing usage of EncryptionException
Morris Jobke [Fri, 17 Oct 2014 09:35:16 +0000 (11:35 +0200)]
Merge pull request #11629 from owncloud/add-notice-to-php-doc
Add PHPDoc about sanitization of "insertIfNotExist"
Morris Jobke [Fri, 17 Oct 2014 09:32:29 +0000 (11:32 +0200)]
Merge pull request #11594 from owncloud/sharing_toggle_password
set password field placeholder back if passward was disabled
Lukas Reschke [Fri, 17 Oct 2014 09:06:49 +0000 (11:06 +0200)]
Add PHPDoc about sanitization of "insertIfNotExist"
Let's document this potential pitfall properly.
Thomas Müller [Fri, 17 Oct 2014 08:12:46 +0000 (10:12 +0200)]
Merge pull request #11627 from owncloud/fix-sample.php-syntax
fix the RST syntax of config.sample.php
Jörn Friedrich Dreyer [Fri, 17 Oct 2014 07:49:52 +0000 (09:49 +0200)]
Merge pull request #11552 from owncloud/fix_files_external_flickering
Fix files external flickering
Jenkins for ownCloud [Fri, 17 Oct 2014 05:58:25 +0000 (01:58 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 16 Oct 2014 22:57:35 +0000 (00:57 +0200)]
fix the RST syntax of config.sample.php
Morris Jobke [Thu, 16 Oct 2014 22:35:51 +0000 (00:35 +0200)]
read config.sample.php options and whitespace fixes
Lukas Reschke [Thu, 16 Oct 2014 21:35:42 +0000 (23:35 +0200)]
Merge pull request #11626 from owncloud/add-l10n
Use l10n on this string as well
Vincent Petry [Thu, 16 Oct 2014 20:27:08 +0000 (22:27 +0200)]
Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-condition
Add a try catch block
Lukas Reschke [Thu, 16 Oct 2014 20:04:24 +0000 (22:04 +0200)]
Use l10n on this string as well
Lukas Reschke [Thu, 16 Oct 2014 19:45:09 +0000 (21:45 +0200)]
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.
Thomas Müller [Thu, 16 Oct 2014 14:57:40 +0000 (16:57 +0200)]
Merge pull request #11617 from owncloud/fix-unit
Fix unit test
Lukas Reschke [Thu, 16 Oct 2014 13:54:57 +0000 (15:54 +0200)]
Merge pull request #11591 from owncloud/addAppVersionToCSSandJS
Add app version to JS and CSS
Lukas Reschke [Thu, 16 Oct 2014 13:54:36 +0000 (15:54 +0200)]
Merge pull request #11521 from owncloud/configsamplephp
small corrections to config.sample.php
Lukas Reschke [Thu, 16 Oct 2014 13:41:45 +0000 (15:41 +0200)]
Fix unit test
Regression introduced with https://github.com/owncloud/core/pull/11615
Clark Tomlinson [Thu, 16 Oct 2014 13:40:14 +0000 (09:40 -0400)]
Merge pull request #11615 from owncloud/fix-translation-source-string
fixing typo in English source string
Lukas Reschke [Thu, 16 Oct 2014 13:36:04 +0000 (15:36 +0200)]
Merge pull request #11383 from ockham/share-tags2
Share tags
blizzz [Thu, 16 Oct 2014 13:35:30 +0000 (15:35 +0200)]
Merge pull request #11478 from owncloud/fix-11448
LDAP: add setting to wizard that disables auto-detection and enables raw mode
Thomas Müller [Thu, 16 Oct 2014 13:24:28 +0000 (15:24 +0200)]
fixing typo in English source string
Thomas Müller [Thu, 16 Oct 2014 11:29:51 +0000 (13:29 +0200)]
include the apps' versions hash to invalidate the cached assets
Robin Appelman [Thu, 16 Oct 2014 11:01:30 +0000 (13:01 +0200)]
Merge pull request #11609 from owncloud/trashbin-space-constant
Fix SPACE_UNKNOWN constant
Lukas Reschke [Thu, 16 Oct 2014 10:40:09 +0000 (12:40 +0200)]
Remove insane comment
Lukas Reschke [Thu, 16 Oct 2014 10:13:16 +0000 (12:13 +0200)]
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
Robin Appelman [Thu, 16 Oct 2014 10:26:26 +0000 (12:26 +0200)]
Fix SPACE_UNKNOWN constant
Arthur Schiwon [Thu, 16 Oct 2014 10:08:05 +0000 (12:08 +0200)]
left-align checkbox on server tab
blizzz [Thu, 16 Oct 2014 09:33:12 +0000 (11:33 +0200)]
Merge pull request #11595 from owncloud/make_get_display_name_more_robust
strip whitespace from the beginning and end of the display name
Vincent Petry [Thu, 16 Oct 2014 09:21:49 +0000 (11:21 +0200)]
Merge pull request #11524 from nazar-pc/patch-1
Page size calculation based on real page height
Jörn Friedrich Dreyer [Fri, 10 Oct 2014 16:26:43 +0000 (18:26 +0200)]
make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space
Jenkins for ownCloud [Thu, 16 Oct 2014 05:56:30 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Wed, 15 Oct 2014 19:21:45 +0000 (21:21 +0200)]
Merge pull request #11570 from owncloud/backport-11408-master
Backport 11408 master
Lukas Reschke [Wed, 15 Oct 2014 19:12:50 +0000 (21:12 +0200)]
Merge pull request #11565 from owncloud/fix-behaviourOnOSX
Add darwin to if block
Lukas Reschke [Wed, 15 Oct 2014 17:58:27 +0000 (19:58 +0200)]
Merge pull request #11528 from owncloud/use-raw-url
Use `rawurlencode` since this seems to be expected by cURL
Nazar Mokrynskyi [Wed, 15 Oct 2014 17:18:35 +0000 (19:18 +0200)]
Changed fileList.pageSize to function call
Nazar Mokrynskyi [Wed, 15 Oct 2014 17:17:21 +0000 (19:17 +0200)]
Typo
Jörn Friedrich Dreyer [Wed, 15 Oct 2014 16:43:12 +0000 (18:43 +0200)]
Merge pull request #11596 from owncloud/in_cli_mode_return_true_for_ishtaccessworking
in cli mode return true for isHtaccessWorking
Arthur Schiwon [Wed, 15 Oct 2014 15:44:41 +0000 (17:44 +0200)]
rephrase xp'ed user mode label
Arthur Schiwon [Wed, 15 Oct 2014 15:28:18 +0000 (17:28 +0200)]
remove debug output
Jörn Friedrich Dreyer [Wed, 15 Oct 2014 14:59:28 +0000 (16:59 +0200)]
in cli mode return true for isHtaccessWorking
Jan-Christoph Borchardt [Wed, 15 Oct 2014 14:26:53 +0000 (16:26 +0200)]
Merge pull request #10426 from owncloud/enhanced-apps-management
Enhanced apps management
Nazar Mokrynskyi [Wed, 15 Oct 2014 13:24:03 +0000 (15:24 +0200)]
Even better - usage of this.$container instead of this.$el.parent()
Thomas Müller [Thu, 14 Aug 2014 13:48:38 +0000 (15:48 +0200)]
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
Nazar Mokrynskyi [Wed, 15 Oct 2014 13:09:01 +0000 (15:09 +0200)]
Stub for pageSize, because now it is dynamically calculated
Nazar Mokrynskyi [Wed, 15 Oct 2014 13:06:35 +0000 (15:06 +0200)]
this.$el is not the same as $('#app-content')
That is why we use `this.$el.parent()` instead
Nazar Mokrynskyi [Wed, 15 Oct 2014 12:55:24 +0000 (14:55 +0200)]
Use function call for FileList.pageSize
Bjoern Schiessle [Wed, 15 Oct 2014 12:05:18 +0000 (14:05 +0200)]
strip whitespace from the beginning and end of the display name to avoid empty display names
Vincent Petry [Wed, 15 Oct 2014 12:39:07 +0000 (14:39 +0200)]
Merge pull request #11538 from owncloud/webdav-creatable-info
Use the cached fileinfo to get creatable permissions
Nazar Mokrynskyi [Wed, 15 Oct 2014 12:16:17 +0000 (14:16 +0200)]
Use this.$el instead of the absolute selector
Lukas Reschke [Wed, 15 Oct 2014 09:23:42 +0000 (11:23 +0200)]
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
Vincent Petry [Wed, 15 Oct 2014 11:31:05 +0000 (13:31 +0200)]
Merge pull request #11541 from owncloud/usersession-activeuser-setsession
Unset the cached active user when using a different session object
Vincent Petry [Wed, 15 Oct 2014 11:27:23 +0000 (13:27 +0200)]
Merge pull request #11548 from owncloud/extstorage-ocfields
Allow specifying protocol in ext storage OC config
Arthur Schiwon [Wed, 15 Oct 2014 10:51:46 +0000 (12:51 +0200)]
instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui
Arthur Schiwon [Wed, 15 Oct 2014 10:41:53 +0000 (12:41 +0200)]
show busy cursor and lock tabs on save
Bjoern Schiessle [Wed, 15 Oct 2014 10:30:31 +0000 (12:30 +0200)]
set password field placeholder back if passward was disabled
Vincent Petry [Wed, 15 Oct 2014 08:52:29 +0000 (10:52 +0200)]
Merge pull request #11590 from owncloud/publiclinkscrollanimatefix
Use body element when animating scroll in public page
Vincent Petry [Wed, 15 Oct 2014 08:14:20 +0000 (10:14 +0200)]
Use body element when animating scroll in public page
In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.
Jenkins for ownCloud [Wed, 15 Oct 2014 05:54:26 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Tue, 14 Oct 2014 23:57:45 +0000 (16:57 -0700)]
commented out instanceid and passwordsalt
Carla Schroder [Tue, 14 Oct 2014 17:00:20 +0000 (10:00 -0700)]
some small tweaks
Arthur Schiwon [Tue, 14 Oct 2014 15:39:27 +0000 (17:39 +0200)]
show Spinner when stuff is being saved
Thomas Müller [Tue, 14 Oct 2014 02:49:29 +0000 (04:49 +0200)]
fixing typos
Lukas Reschke [Fri, 3 Oct 2014 13:14:22 +0000 (15:14 +0200)]
Refactor MailSettings controller
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385)
- Refactor to AppFramework
- Add unit tests
Conflicts:
settings/admin/controller.php
Lukas Reschke [Sun, 12 Oct 2014 16:40:10 +0000 (18:40 +0200)]
Use `rawurlencode` since this seems to be expected by cURL
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-
58794405
Lukas Reschke [Tue, 14 Oct 2014 10:58:00 +0000 (12:58 +0200)]
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.
Jörn Friedrich Dreyer [Tue, 14 Oct 2014 08:41:10 +0000 (10:41 +0200)]
Merge pull request #11556 from owncloud/cache-js-and-css
adding cache control headers for css and js - fixes #11496
Vincent Petry [Tue, 14 Oct 2014 07:16:31 +0000 (09:16 +0200)]
Merge pull request #11534 from owncloud/issue/11500
Issue/11500 Do not set overwrite* settings by default
Jenkins for ownCloud [Tue, 14 Oct 2014 05:54:28 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 14 Oct 2014 04:36:53 +0000 (06:36 +0200)]
adding cache control headers for css and js - fixes #11496
Joas Schilling [Mon, 13 Oct 2014 09:18:24 +0000 (11:18 +0200)]
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
Bernhard Reiter [Mon, 13 Oct 2014 21:12:18 +0000 (23:12 +0200)]
PHPDoc fixes as suggested by @MorrisJobke.
Bernhard Reiter [Mon, 13 Oct 2014 20:30:36 +0000 (22:30 +0200)]
Add getTag() function for accessing of a single tag.
Bernhard Reiter [Fri, 10 Oct 2014 21:18:43 +0000 (23:18 +0200)]
Make loading of tags from DB more explicit.
Bernhard Reiter [Fri, 3 Oct 2014 17:32:39 +0000 (19:32 +0200)]
In Tags::rename($from, $to), check if there already is a tag named $to.
Bernhard Reiter [Mon, 15 Sep 2014 22:20:52 +0000 (00:20 +0200)]
Add option to include tags for shared items.
Bernhard Reiter [Sat, 4 Oct 2014 12:08:20 +0000 (14:08 +0200)]
Remove two obsolete try...catch blocks.
Bernhard Reiter [Mon, 8 Sep 2014 17:58:43 +0000 (19:58 +0200)]
Implement Tag and TagMapper classes.
Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
Bernhard Reiter [Thu, 2 Oct 2014 14:08:24 +0000 (16:08 +0200)]
Remove redundant null initializations.
Bernhard Reiter [Tue, 30 Sep 2014 10:19:08 +0000 (12:19 +0200)]
Test addMultiple() with $sync=true.
Bernhard Reiter [Mon, 6 Oct 2014 19:06:46 +0000 (21:06 +0200)]
Test Tags::getFavorites().
Bernhard Reiter [Mon, 8 Sep 2014 21:38:46 +0000 (23:38 +0200)]
Fix a comment.
Jörn Friedrich Dreyer [Mon, 13 Oct 2014 16:40:57 +0000 (18:40 +0200)]
cleanup variable names and duplicate jQuery selectors
Thomas Müller [Mon, 13 Oct 2014 15:59:12 +0000 (17:59 +0200)]
Merge pull request #11543 from owncloud/closeSessionForAppsLoading
Close session when loading apps
Jörn Friedrich Dreyer [Mon, 13 Oct 2014 15:49:40 +0000 (17:49 +0200)]
fix flickering users
Vincent Petry [Mon, 13 Oct 2014 15:27:13 +0000 (17:27 +0200)]
Merge pull request #11546 from owncloud/users-deletewithfilecache
Retrieve storage numeric id earlier when still available