sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,796 Commits
627 Branches
1167 Tags
9.1 GiB
Commit Graph

10555 Commits (87bc02c6cd482a28aa175d269d48a849ca9eb399)

Author SHA1 Message Date
Joas Schilling 87bc02c6cd Allow specifying a custom reset-password-url 2015-12-07 15:41:40 +07:00
Joas Schilling f8f3c9ecf9 Remove password reset when the user can not change the password 2015-12-07 15:14:19 +07:00
Thomas Müller 764b2932ff Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent 
Remove OC_Util::getUrlContent and replace by proper usage of public i…
 2015-12-07 10:21:16 +07:00
Thomas Müller f3d49a89fe Merge pull request #11131 from owncloud/use-phpini-wrapper 
Replacing ini_get instances with inigetwrapper usages
 2015-12-07 10:20:59 +07:00
Thomas Müller 0c3d97921f Merge pull request #20904 from owncloud/view-mime-filter 
Fix mimetype filter in getDirectoryContent
 2015-12-07 10:20:43 +07:00
Thomas Müller e1f2965e54 Merge pull request #20949 from owncloud/fix_20892 
[Sharing] Properly check if a group already has access
 2015-12-07 10:20:05 +07:00
Thomas Müller c1fb9fa483 Merge pull request #20957 from owncloud/use-correct-method-signature 
Use correct method signature
 2015-12-07 10:18:03 +07:00
Thomas Müller c9069d5711 Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry 
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
 2015-12-07 10:17:44 +07:00
Jenkins for ownCloud 884946276e [tx-robot] updated from transifex 2015-12-07 01:54:35 +07:00
Jenkins for ownCloud d14f128329 [tx-robot] updated from transifex 2015-12-06 01:54:33 +07:00
Jenkins for ownCloud f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 +07:00
Morris Jobke 4548a0aa90 Remove OC_Util::getUrlContent and replace by proper usage of public interfaces 2015-12-04 18:02:47 +07:00
Morris Jobke 46a6c6d70b remove OC_App::getActiveNavigationEntry - not unsed anymore 2015-12-04 17:26:28 +07:00
Morris Jobke e6d4496fc2 Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App 2015-12-04 17:23:51 +07:00
Lukas Reschke d522797227 Use correct method signature 
This function takes only one parameter
 2015-12-04 15:52:42 +07:00
Roeland Jago Douma 11d8b336e2 [Sharing] Properly check if a group already has access 
The old code check was to liberal resulting in wrong matches if a user
with the same name as the group already had access.

Fixes 20892
 2015-12-04 12:22:21 +07:00
Thomas Müller 6034c9142d Merge pull request #20933 from owncloud/more-OC_Config-cleanups 
More cleanups of OC_Config usage
 2015-12-04 09:06:47 +07:00
Jenkins for ownCloud a2848af625 [tx-robot] updated from transifex 2015-12-04 01:56:31 +07:00
Thomas Müller 602b636d3e Merge pull request #20807 from owncloud/dont-append-redirect-url-if-user-is-already-logged-in 
Don't append redirect URL if user is logged-in
 2015-12-03 16:53:59 +07:00
Thomas Müller 2ceae43989 Merge pull request #20545 from owncloud/scan-storage-in-background-job 
Move files/ajax/scan.php to background job
 2015-12-03 16:53:46 +07:00
Morris Jobke c60c793cf2 More cleanups of OC_Config usage 2015-12-03 16:41:23 +07:00
Thomas Müller 1fe7957fd0 Merge pull request #20924 from owncloud/use-url-generator-to-generate-link 
Use URLGenerator instead of hard-coded WEBROOT
 2015-12-03 15:26:14 +07:00
Lukas Reschke 1f69dcb593 Use URLGenerator instead of hard-coded WEBROOT 
Fixes https://github.com/owncloud/core/issues/20922
 2015-12-03 14:42:14 +07:00
Morris Jobke aa0265bd34 Replace OC_Config in setup 2015-12-03 14:35:15 +07:00
Thomas Müller 2d1cc8aaeb Merge pull request #19461 from owncloud/reuse_code 
reuse code
 2015-12-03 13:55:50 +07:00
Robin Appelman 19b2fe6a3a Fix mimetype filter in getDirectoryContent 2015-12-03 13:09:13 +07:00
Jesús Macias 9dd11091d4 Fix code from comments 2015-12-03 10:00:11 +07:00
Jesús Macias 98f5c50aa4 Migrate storate status code to storagenotavailablexception 2015-12-03 09:59:45 +07:00
Jesús Macias 4ead2bc861 Fix code from PR comments 2015-12-03 09:58:55 +07:00
Jesús Macias 7cd13f462a Add new external storage exceptions for different errors 2015-12-03 09:57:59 +07:00
Thomas Müller e7239b6553 Merge pull request #20872 from owncloud/systemtags-better-not-found-exception 
Systemtags better not found exception
 2015-12-03 09:26:05 +07:00
Thomas Müller a5c80ba8bc Merge pull request #20894 from owncloud/post-delete-meta-view 
Also add metadata for postDelete hooks triggered from the view
 2015-12-03 09:24:54 +07:00
Thomas Müller 7fefd4f4d9 Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place 
User IUser::getEMailAddress() all over the place
 2015-12-03 09:21:53 +07:00
Thomas Müller 09600058d0 Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff 
Replace old config code with usage of proper APIs
 2015-12-02 21:54:42 +07:00
Thomas Müller dcc7ff09ba Adding unit test for MailNotifications::sendInternalShareMail() 2015-12-02 21:42:14 +07:00
Thomas Müller eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +07:00
Thomas Müller df5872ec50 Merge pull request #20719 from owncloud/adding-system-addressbook-of-users 
Adding system addressbook for users of this instance - a occ command …
 2015-12-02 16:17:58 +07:00
Morris Jobke 37ecde065b Replace old config code with usage of proper APIs 2015-12-02 15:56:59 +07:00
Morris Jobke baecfc4080 Reduce OC_Config usage in lib/ 
* replaced by proper public interfaces
 2015-12-02 14:49:40 +07:00
Thomas Müller 28ceab2f61 Fix endless recursion 2015-12-02 14:44:41 +07:00
Robin Appelman 0062888aaf Also add metadata for postDelete hooks triggered from the view 2015-12-02 13:51:26 +07:00
Thomas Müller 8d218bf3ef Merge pull request #20875 from owncloud/remove-changepropagator 
remove old propagation logic
 2015-12-02 13:03:31 +07:00
Lukas Reschke 4d9af08f12 Execute only for web and not for CLI 2015-12-02 11:49:33 +07:00
Lukas Reschke 09d9e430d8 Add a trailing slash to generated URLs 2015-12-02 11:27:07 +07:00
Lukas Reschke 125b7e7512 Ensure that ownCloud is always accessed with a trailing slash 2015-12-02 11:26:41 +07:00
Thomas Müller 812a390f32 Merge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active 
Check if rewrite base is set if rewrite is active
 2015-12-02 10:56:44 +07:00
Thomas Müller c46ea30248 Merge pull request #20865 from owncloud/post-delete-meta 
Add metadata to post delete hooks
 2015-12-02 10:12:54 +07:00
Thomas Müller f840d8dee7 Merge pull request #20874 from owncloud/allow-di-mimetypedetector 
Allow DI for OCP\Files\IMimeTypeDetector
 2015-12-02 10:12:35 +07:00
Thomas Müller 0bd0212731 Merge pull request #20877 from owncloud/fix-empty-expirationDate 
Check the expiration date for null
 2015-12-02 10:12:16 +07:00
Thomas Müller 4c695e63c0 Fix comments 2015-12-02 09:20:58 +07:00