Commit Graph

21791 Commits

Author SHA1 Message Date
Lukas Reschke 216d617938 Remove OC_Migrate
This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
Lukas Reschke c556382160 Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore
add puphpet and vagrant to gitignore
2014-11-24 09:01:23 +01:00
Jenkins for ownCloud 0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Lukas Reschke cebfdd877d Merge pull request #12372 from owncloud/preview_tiff_fix
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
2014-11-24 01:12:43 +01:00
Georg Ehrke 03a975a080 add puphpet and vagrant to gitignore 2014-11-23 23:01:50 +01:00
Georg Ehrke 45d985f2d8 remove ugly hack and don't use OC\Preview\Image for tiffs and svgs 2014-11-23 19:11:03 +01:00
Jenkins for ownCloud a3496cf7fa [tx-robot] updated from transifex 2014-11-23 01:54:39 -05:00
Morris Jobke fe46393115 Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci
Rename providers to not begin with test
2014-11-22 16:41:29 +01:00
Morris Jobke 2cc3edb10d Merge pull request #12328 from owncloud/remove-testcleanuplistener
Remove testcleanuplistener
2014-11-22 10:05:47 +01:00
Jenkins for ownCloud fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Arthur Schiwon 9aef83b579 make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise) 2014-11-22 00:51:41 +01:00
Lukas Reschke 8c2aeb9b21 Add OCS API header per default
Relieve @PVince from having to write it all the time ;-)
2014-11-21 19:54:19 +01:00
Arthur Schiwon 503de94392 make updateCount work properly with new xp'd mode as well as without 2014-11-21 16:23:56 +01:00
Bjoern Schiessle a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Lukas Reschke 0fa8b449b2 Use `/` as redirect location if webroot is set to an empty value
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
2014-11-21 15:38:36 +01:00
Arthur Schiwon c07c338c90 fix counting when ldapPagingSize is 0 2014-11-21 14:51:20 +01:00
Miguel Prokop 397f14ed86 Consolidate if statement, and update unit test 2014-11-21 13:31:56 +01:00
Thomas Müller 13b06aa6df Merge pull request #12342 from owncloud/fix-master-unit-tests
fix unit tests of mdb2scheamreader
2014-11-21 13:07:51 +01:00
Miguel Prokop 1d4d308a6c fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire. 2014-11-21 11:01:39 +01:00
Lukas Reschke 5f6f54e785 Rename providers to not begin with test
Fixes https://github.com/owncloud/core/issues/12347
2014-11-21 10:54:41 +01:00
Jenkins for ownCloud f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Thomas Müller 61d5a522a4 Merge pull request #12344 from owncloud/fixstypo
update grammar
2014-11-21 08:40:07 +01:00
Volkan Gezer 388ef07c20 update grammar
Suggested by mnestis on Transifex.
2014-11-21 02:17:02 +01:00
Morris Jobke 75d37b69f6 fix unit tests of mdb2scheamreader 2014-11-20 22:35:37 +01:00
Morris Jobke 593ef76e36 Revert "drop OC_Preferences::getUsers and getApps"
This reverts commit 09fd34eed9.
2014-11-20 22:02:26 +01:00
Morris Jobke 78d9d49112 Merge pull request #12336 from owncloud/drop-getApps-getUsers
drop OC_Preferences::getUsers and getApps
2014-11-20 21:59:15 +01:00
Arthur Schiwon b5e707b1bf trigger count on the correct filter 2014-11-20 18:31:40 +01:00
Arthur Schiwon 6b6147dafd phpdoc and mixed up letters 2014-11-20 18:31:40 +01:00
Arthur Schiwon 031d6c179f better readbility, no effective changes 2014-11-20 18:31:40 +01:00
Arthur Schiwon 0e6d47123a use underscore.js for undefined checks 2014-11-20 18:31:40 +01:00
Arthur Schiwon d8bb8afee3 this happens already before counting, no need anymore 2014-11-20 18:31:40 +01:00
Arthur Schiwon c9e865629e JS doc 2014-11-20 18:31:40 +01:00
Arthur Schiwon 4a3fe42b16 a corrected email attribute needs to be saved, not only returned 2014-11-20 18:31:39 +01:00
Arthur Schiwon f9b4f5f4e5 to reassure that selected attributes still work, do not count all matching entries but limit it to 1 in order to make it faster 2014-11-20 18:31:39 +01:00
Arthur Schiwon 71944a59a5 detectors (email, displayname..) are now started in one place, triggered from only 2 places. more reliable structure and flow, saves requests 2014-11-20 18:31:39 +01:00
Arthur Schiwon f725cc66a3 consolidate user count filter in wizard and user back end 2014-11-20 18:31:39 +01:00
Arthur Schiwon cb3af1dce2 detect user display name attribute and return user count depending on its presence 2014-11-20 18:31:39 +01:00
Morris Jobke 09fd34eed9 drop OC_Preferences::getUsers and getApps 2014-11-20 17:56:05 +01:00
Morris Jobke 985f8c3f69 Merge pull request #12330 from owncloud/jenkins-eat-that
drop dependency of some commands on old config object
2014-11-20 17:11:08 +01:00
Thomas Müller 7fa4c6d0bc Merge pull request #12321 from owncloud/checkForXMLWriter
Check for XMLWriter class
2014-11-20 17:04:27 +01:00
Vincent Petry 391ece46e3 Fix file upload to ext storage when recovery key is enabled
Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
Morris Jobke 604bf61e10 Merge pull request #12299 from owncloud/clean-lib-base-config
replace all static calls to OC_Config and OC_Preferences to calls to OCP...
2014-11-20 16:24:37 +01:00
Lukas Reschke 713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Joas Schilling b842059285 Remove testcleanuplistener.php 2014-11-20 15:26:27 +01:00
Joas Schilling 84d358a761 Clean up the test data in tearDownAfterClass()
The result of the listener should then be empty and can be removed
2014-11-20 15:26:26 +01:00
Morris Jobke 8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Thomas Müller cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Morris Jobke 46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer 995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Morris Jobke 288acb55a0 Merge pull request #12305 from owncloud/sharelist-nodelete
Remove delete button in shared with others list
2014-11-20 13:32:07 +01:00