Commit graph

21192 commits

Author SHA1 Message Date
Thomas Müller
7f41048a33 Merge pull request #11962 from owncloud/fix-server-sharing-strings
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
Morris Jobke
4fa3a5034b drop unused jquery.placeholder 2014-11-05 13:41:11 +01:00
Morris Jobke
f0d6a47a67 Merge pull request #11966 from owncloud/drop-jquery-inview
drop jquery.inview as it is unused
2014-11-05 13:11:48 +01:00
Morris Jobke
a857bf1d50 drop jquery.inview as it is unused 2014-11-05 12:57:18 +01:00
Vincent Petry
97cbec8b8d Merge pull request #11853 from owncloud/close-session-for-trashbin
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
Bernhard Posselt
91a23bfa9c fix typo in content type 2014-11-05 12:04:56 +01:00
Thomas Müller
810dd956b4 Merge pull request #11953 from owncloud/drop-listview-js
drop listview.js
2014-11-05 11:31:53 +01:00
Morris Jobke
2c941729ee ignore core/vendor in scrutinizer 2014-11-05 11:13:00 +01:00
Thomas Müller
8116d903dd adjust strings - fixed #11930 2014-11-05 11:08:17 +01:00
Jenkins for ownCloud
c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Vincent Petry
140faf2c30 Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile
Check for cert bundle existence before using it
2014-11-04 20:05:49 +01:00
Vincent Petry
ee6d8c9d58 Store curl error message directly 2014-11-04 17:37:15 +01:00
Morris Jobke
5a6cbea261 drop listview.js
* isn't used in core and isn't mentioned in documentation
2014-11-04 17:28:35 +01:00
Vincent Petry
768f3979e0 Check for cert bundle existence before using it 2014-11-04 16:44:42 +01:00
Thomas Müller
9323ba53b1 Merge pull request #11940 from owncloud/fix-underline-convention
fix shortcuts - underline instead of camelCase
2014-11-04 14:51:19 +01:00
Thomas Müller
9e045d6c0f Merge pull request #11938 from owncloud/jshintrc-laxbreak
enable laxbreak option in jshintrc to comply with our coding guide lines
2014-11-04 14:49:58 +01:00
Morris Jobke
74d375d8ea migrate jQuery to bower 2014-11-04 14:28:29 +01:00
Vincent Petry
79a7297880 Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
Only rescan trash folder when checking deleted versions
2014-11-04 14:16:58 +01:00
Morris Jobke
7f4e447a5f fix shortcuts - underline instead of camelCase 2014-11-04 13:57:38 +01:00
blizzz
b26f11c16f Merge pull request #11362 from mark0n/rm_ldap_conf_cli
Add a CLI command that deletes an LDAP config
2014-11-04 13:19:45 +01:00
Arthur Schiwon
65cfe4796d enable laxbreak option in jshintrc to comply with our coding guide lines 2014-11-04 12:51:54 +01:00
Vincent Petry
97a51c46ed 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.
2014-11-04 12:29:42 +01:00
Morris Jobke
d5c98add58 fix whitespace 2014-11-04 12:22:15 +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
Morris Jobke
f6cf654354 Merge pull request #11931 from owncloud/fix-js-unit-tests
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
2014-11-04 11:38:26 +01:00
Morris Jobke
d94606cfa2 use https ... everywhere :) 2014-11-04 10:55:18 +01:00
Morris Jobke
1979ec70a5 JS unit tests fix - use toBeUndefined() instead of toEqual(null) 2014-11-04 10:37:16 +01:00
Morris Jobke
6f0c814164 fix config.sample.php linebreak 2014-11-04 09:23:38 +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
Morris Jobke
d2276215a4 update 3rdparty to master 2014-11-03 20:31:53 +01:00
Morris Jobke
2b691b9915 update 3rdparty to master 2014-11-03 20:30:59 +01:00
Thomas Müller
6d85a2995b Merge pull request #11918 from owncloud/pimple-composer
Update Pimple to V3.0
2014-11-03 16:58:30 +01:00
Thomas Müller
994768d99f Update Pimple to V3.0 2014-11-03 16:57:16 +01:00
Lukas Reschke
f8f38b06df Merge pull request #11921 from owncloud/symfony-composer
Symfony composer
2014-11-03 16:42:52 +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
13b18aafcc Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalized
Capitalize Checks in admin page
2014-11-03 15:44:39 +01:00
Vincent Petry
2a454fd04d Capitalize Checks in admin page 2014-11-03 15:41:40 +01:00
blizzz
dc9ea893fd Merge pull request #11172 from owncloud/user-ldap-no-bcmath
Fix ldap convertSID2Str() / Remove BCMath dependency
2014-11-03 14:03:26 +01:00
Thomas Müller
136b0c22c9 Fix ctor call in OC\Core\Command\Upgrade 2014-11-03 13:53:59 +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
Björn Schießle
79b650a023 Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
move versions if a file was renamed in a shared folder
2014-11-03 12:53:14 +01:00
Andreas Fischer
d1410b46a9 user_ldap: Reimplement convertSID2Str() without BCMath dependency.
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
2014-11-03 12:07:53 +01:00
Jenkins for ownCloud
1a5d860be8 [tx-robot] updated from transifex 2014-11-03 01:54:31 -05:00
Morris Jobke
feb42f357f Merge pull request #11902 from unclejamal3000/master
Enhance question in DB migration script
2014-11-02 09:22:25 +01:00
Jenkins for ownCloud
fd480d6c40 [tx-robot] updated from transifex 2014-11-02 01:54:24 -05:00
Jenkins for ownCloud
469b2655d5 [tx-robot] updated from transifex 2014-11-02 01:54:29 -04:00