]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Wed, 5 Nov 2014 22:19:11 +0000 (23:19 +0100)]
bower snapjs
Thomas Müller [Thu, 6 Nov 2014 10:57:33 +0000 (11:57 +0100)]
Merge pull request #11989 from owncloud/bower-zxcvbn
bower zxcvbn
Morris Jobke [Thu, 6 Nov 2014 09:15:22 +0000 (10:15 +0100)]
bower zxcvbn
Thomas Müller [Thu, 6 Nov 2014 10:49:39 +0000 (11:49 +0100)]
Merge pull request #11981 from owncloud/bower-jcrop
bower jcrop
Morris Jobke [Wed, 5 Nov 2014 20:44:31 +0000 (21:44 +0100)]
bower jcrop
Morris Jobke [Thu, 6 Nov 2014 08:27:58 +0000 (09:27 +0100)]
Merge pull request #11980 from owncloud/bower-select2
bower select2
Morris Jobke [Thu, 6 Nov 2014 08:27:12 +0000 (09:27 +0100)]
manage select2 via bower
Vincent Petry [Thu, 6 Nov 2014 07:42:29 +0000 (08:42 +0100)]
Merge pull request #11982 from owncloud/bower-underscore
bower underscore
Jenkins for ownCloud [Thu, 6 Nov 2014 06:55:04 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 5 Nov 2014 23:47:25 +0000 (00:47 +0100)]
Merge pull request #11983 from owncloud/drop-chosen
drop unused library chosen
Morris Jobke [Wed, 5 Nov 2014 21:05:24 +0000 (22:05 +0100)]
bower underscore
Morris Jobke [Wed, 5 Nov 2014 21:41:33 +0000 (22:41 +0100)]
drop unused library chosen
Thomas Müller [Wed, 5 Nov 2014 15:50:58 +0000 (16:50 +0100)]
Merge pull request #11970 from owncloud/bower-handlebars
bower handlebars
Morris Jobke [Wed, 5 Nov 2014 13:14:23 +0000 (14:14 +0100)]
bower handlebars
Lukas Reschke [Wed, 5 Nov 2014 15:43:24 +0000 (16:43 +0100)]
Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
Lukas Reschke [Wed, 5 Nov 2014 14:04:23 +0000 (15:04 +0100)]
Merge pull request #11968 from owncloud/drop-jquery-placeholder
drop unused jquery.placeholder
Thomas Müller [Wed, 5 Nov 2014 13:18:16 +0000 (14:18 +0100)]
Merge pull request #11355 from owncloud/unbold
Unbold
Jan-Christoph Borchardt [Mon, 29 Sep 2014 14:39:07 +0000 (16:39 +0200)]
explicitly unbold text by default, otherwise might be bold
Jan-Christoph Borchardt [Mon, 29 Sep 2014 14:38:37 +0000 (16:38 +0200)]
unbold labels and folders
Thomas Müller [Wed, 5 Nov 2014 13:03:12 +0000 (14:03 +0100)]
Merge pull request #11965 from owncloud/fix-jsonresponse
fix typo in content type for JSONResponse
Thomas Müller [Wed, 5 Nov 2014 12:54:29 +0000 (13:54 +0100)]
Merge pull request #11928 from owncloud/support-HTML-in-logo
Support HTML in logo
Thomas Müller [Wed, 5 Nov 2014 12:43:23 +0000 (13:43 +0100)]
Merge pull request #11962 from owncloud/fix-server-sharing-strings
adjust strings - fixed #11930
Morris Jobke [Wed, 5 Nov 2014 12:41:11 +0000 (13:41 +0100)]
drop unused jquery.placeholder
Morris Jobke [Wed, 5 Nov 2014 12:11:48 +0000 (13:11 +0100)]
Merge pull request #11966 from owncloud/drop-jquery-inview
drop jquery.inview as it is unused
Morris Jobke [Wed, 5 Nov 2014 11:57:18 +0000 (12:57 +0100)]
drop jquery.inview as it is unused
Vincent Petry [Wed, 5 Nov 2014 11:44:10 +0000 (12:44 +0100)]
Merge pull request #11853 from owncloud/close-session-for-trashbin
Close session for files_trashbin
Bernhard Posselt [Wed, 5 Nov 2014 11:04:56 +0000 (12:04 +0100)]
fix typo in content type
Thomas Müller [Wed, 5 Nov 2014 10:31:53 +0000 (11:31 +0100)]
Merge pull request #11953 from owncloud/drop-listview-js
drop listview.js
Morris Jobke [Wed, 5 Nov 2014 10:13:00 +0000 (11:13 +0100)]
ignore core/vendor in scrutinizer
Thomas Müller [Wed, 5 Nov 2014 10:08:17 +0000 (11:08 +0100)]
adjust strings - fixed #11930
Jenkins for ownCloud [Wed, 5 Nov 2014 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Vincent Petry [Tue, 4 Nov 2014 19:05:49 +0000 (20:05 +0100)]
Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile
Check for cert bundle existence before using it
Vincent Petry [Tue, 4 Nov 2014 16:37:15 +0000 (17:37 +0100)]
Store curl error message directly
Morris Jobke [Tue, 4 Nov 2014 16:28:35 +0000 (17:28 +0100)]
drop listview.js
* isn't used in core and isn't mentioned in documentation
Vincent Petry [Tue, 4 Nov 2014 15:44:42 +0000 (16:44 +0100)]
Check for cert bundle existence before using it
Thomas Müller [Tue, 4 Nov 2014 13:51:19 +0000 (14:51 +0100)]
Merge pull request #11940 from owncloud/fix-underline-convention
fix shortcuts - underline instead of camelCase
Thomas Müller [Tue, 4 Nov 2014 13:49:58 +0000 (14:49 +0100)]
Merge pull request #11938 from owncloud/jshintrc-laxbreak
enable laxbreak option in jshintrc to comply with our coding guide lines
Morris Jobke [Tue, 4 Nov 2014 11:51:29 +0000 (12:51 +0100)]
migrate jQuery to bower
Vincent Petry [Tue, 4 Nov 2014 13:16:58 +0000 (14:16 +0100)]
Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
Only rescan trash folder when checking deleted versions
Morris Jobke [Tue, 4 Nov 2014 12:57:38 +0000 (13:57 +0100)]
fix shortcuts - underline instead of camelCase
blizzz [Tue, 4 Nov 2014 12:19:45 +0000 (13:19 +0100)]
Merge pull request #11362 from mark0n/rm_ldap_conf_cli
Add a CLI command that deletes an LDAP config
Arthur Schiwon [Tue, 4 Nov 2014 11:51:54 +0000 (12:51 +0100)]
enable laxbreak option in jshintrc to comply with our coding guide lines
Vincent Petry [Tue, 4 Nov 2014 11:29:42 +0000 (12:29 +0100)]
Only rescan trash folder when checking deleted versions
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
Morris Jobke [Tue, 4 Nov 2014 11:22:15 +0000 (12:22 +0100)]
fix whitespace
Morris Jobke [Tue, 4 Nov 2014 10:59:33 +0000 (11:59 +0100)]
Merge pull request #11916 from owncloud/introduce-bower
Introduce bower dependency managment for frontend libraries
Morris Jobke [Tue, 4 Nov 2014 10:38:26 +0000 (11:38 +0100)]
Merge pull request #11931 from owncloud/fix-js-unit-tests
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
Morris Jobke [Tue, 4 Nov 2014 09:55:18 +0000 (10:55 +0100)]
use https ... everywhere :)
Morris Jobke [Tue, 4 Nov 2014 09:37:16 +0000 (10:37 +0100)]
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
Morris Jobke [Tue, 4 Nov 2014 08:23:38 +0000 (09:23 +0100)]
fix config.sample.php linebreak
Jenkins for ownCloud [Tue, 4 Nov 2014 06:55:05 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 3 Nov 2014 20:20:42 +0000 (21:20 +0100)]
Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig
First check whether it is the default config before touching
Lukas Reschke [Mon, 3 Nov 2014 20:13:07 +0000 (21:13 +0100)]
Support HTML in logo claim
Morris Jobke [Mon, 3 Nov 2014 10:18:52 +0000 (11:18 +0100)]
replace moment.js with bower version
* fix JS unit tests
Morris Jobke [Mon, 3 Nov 2014 10:18:17 +0000 (11:18 +0100)]
ability to add bower resources
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
Morris Jobke [Mon, 3 Nov 2014 19:31:53 +0000 (20:31 +0100)]
update 3rdparty to master
Morris Jobke [Mon, 3 Nov 2014 19:30:59 +0000 (20:30 +0100)]
update 3rdparty to master
Thomas Müller [Mon, 3 Nov 2014 15:58:30 +0000 (16:58 +0100)]
Merge pull request #11918 from owncloud/pimple-composer
Update Pimple to V3.0
Thomas Müller [Mon, 3 Nov 2014 12:10:03 +0000 (13:10 +0100)]
Update Pimple to V3.0
Lukas Reschke [Mon, 3 Nov 2014 15:42:52 +0000 (16:42 +0100)]
Merge pull request #11921 from owncloud/symfony-composer
Symfony composer
Lukas Reschke [Mon, 3 Nov 2014 15:37:04 +0000 (16:37 +0100)]
First check whether it is the default config before touchign
Potentially fixes https://github.com/owncloud/core/issues/11678
Thomas Müller [Mon, 3 Nov 2014 14:44:39 +0000 (15:44 +0100)]
Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalized
Capitalize Checks in admin page
Vincent Petry [Mon, 3 Nov 2014 14:41:40 +0000 (15:41 +0100)]
Capitalize Checks in admin page
blizzz [Mon, 3 Nov 2014 13:03:26 +0000 (14:03 +0100)]
Merge pull request #11172 from owncloud/user-ldap-no-bcmath
Fix ldap convertSID2Str() / Remove BCMath dependency
Thomas Müller [Mon, 3 Nov 2014 12:53:59 +0000 (13:53 +0100)]
Fix ctor call in OC\Core\Command\Upgrade
Thomas Müller [Mon, 3 Nov 2014 12:52:47 +0000 (13:52 +0100)]
Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5
Björn Schießle [Mon, 3 Nov 2014 11:53:14 +0000 (12:53 +0100)]
Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
move versions if a file was renamed in a shared folder
Andreas Fischer [Thu, 18 Sep 2014 22:01:57 +0000 (00:01 +0200)]
user_ldap: Reimplement convertSID2Str() without BCMath dependency.
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
Jenkins for ownCloud [Mon, 3 Nov 2014 06:54:31 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 2 Nov 2014 08:22:25 +0000 (09:22 +0100)]
Merge pull request #11902 from unclejamal3000/master
Enhance question in DB migration script
Jenkins for ownCloud [Sun, 2 Nov 2014 06:54:24 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 2 Nov 2014 05:54:29 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
unclejamal3000 [Sat, 1 Nov 2014 23:30:44 +0000 (00:30 +0100)]
Enhance question in DB migration script
Jenkins for ownCloud [Sat, 1 Nov 2014 05:54:37 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Fri, 31 Oct 2014 18:53:47 +0000 (19:53 +0100)]
Merge pull request #11894 from owncloud/fix-unreachable-code
fix odd behaviour
Morris Jobke [Fri, 31 Oct 2014 17:46:47 +0000 (18:46 +0100)]
fix odd behaviour
Bjoern Schiessle [Fri, 31 Oct 2014 15:42:54 +0000 (16:42 +0100)]
don't move versions if only the mount point was renamed
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 12:00:31 +0000 (13:00 +0100)]
test files external amazon s3 storage id migration
Jörn Friedrich Dreyer [Thu, 16 Oct 2014 12:50:39 +0000 (14:50 +0200)]
fix files_external storage id migration
Lukas Reschke [Fri, 31 Oct 2014 12:57:35 +0000 (13:57 +0100)]
Merge pull request #11888 from owncloud/add-code-climeate
Add CodeClimate indicator
Lukas Reschke [Fri, 31 Oct 2014 12:52:14 +0000 (13:52 +0100)]
Add CodeClimate indicator
Vincent Petry [Fri, 31 Oct 2014 12:24:42 +0000 (13:24 +0100)]
Merge pull request #9044 from owncloud/add-missing-email-principal
adding missing email address for principal
Lukas Reschke [Fri, 31 Oct 2014 12:10:59 +0000 (13:10 +0100)]
Merge pull request #11876 from owncloud/remove-pointless-requires
remove unnecessary require calls - the ownCloud class loader is supposed...
Vincent Petry [Fri, 31 Oct 2014 09:42:29 +0000 (10:42 +0100)]
Merge pull request #11539 from owncloud/mount-setup-once
Only mount the storages for the user once
Vincent Petry [Fri, 31 Oct 2014 07:38:05 +0000 (08:38 +0100)]
Merge pull request #11850 from owncloud/fix-11848
on xp'ed mode and switching configurations: save raw mode instead of tog...
Jenkins for ownCloud [Fri, 31 Oct 2014 05:55:39 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 30 Oct 2014 20:43:38 +0000 (21:43 +0100)]
Merge pull request #11877 from owncloud/fix-11875-master
prevent PHP notice
Vincent Petry [Thu, 30 Oct 2014 17:13:46 +0000 (18:13 +0100)]
Merge pull request #11080 from owncloud/addheader-text-2
Fix the addHeader tag attributes text methods to not ignore the text parameter
Vincent Petry [Thu, 30 Oct 2014 17:06:25 +0000 (18:06 +0100)]
Merge pull request #11659 from jknockaert/master
rework getFileSize
Thomas Müller [Thu, 30 Oct 2014 16:24:25 +0000 (17:24 +0100)]
prevent PHP notice
Thomas Müller [Thu, 30 Oct 2014 16:20:40 +0000 (17:20 +0100)]
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
Thomas Müller [Thu, 30 Oct 2014 16:14:07 +0000 (17:14 +0100)]
Merge pull request #11740 from owncloud/update-archive-tar
Update pear/archive_tar to 1.3.13
Jan-Christoph Borchardt [Thu, 30 Oct 2014 16:03:03 +0000 (17:03 +0100)]
Merge pull request #11867 from owncloud/settings-sidebar-admin
introduce sidebar for admin page
Lukas Reschke [Thu, 30 Oct 2014 15:47:46 +0000 (16:47 +0100)]
Merge pull request #11864 from owncloud/clear-session-after-logout
Clear session after logout
Morris Jobke [Thu, 30 Oct 2014 15:19:39 +0000 (16:19 +0100)]
Merge pull request #11858 from owncloud/fix-11064
Allow any outgoing XHR connections
Thomas Müller [Thu, 23 Oct 2014 13:51:01 +0000 (15:51 +0200)]
Update pear/archive_tar to 1.3.13
Jan-Christoph Borchardt [Thu, 30 Oct 2014 15:04:26 +0000 (16:04 +0100)]
admin settings: fix LDAP settings header layout
Thomas Müller [Thu, 30 Oct 2014 13:59:13 +0000 (14:59 +0100)]
fix loading of more log entries
Thomas Müller [Thu, 30 Oct 2014 13:45:58 +0000 (14:45 +0100)]
Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro
Fix stupid copy paste fail
Morris Jobke [Thu, 30 Oct 2014 13:05:25 +0000 (14:05 +0100)]
Merge pull request #11821 from owncloud/generic-response
Add a generic data response
Thomas Müller [Thu, 30 Oct 2014 12:55:33 +0000 (13:55 +0100)]
fixing ldap listing in admin sidebar - needs styling review
projects / nextcloud-server.git / log