wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28829 commits 157 branches 562 tags 714 MiB
Commit graph

28829 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
9f98849306 Add a method to the get "to use" table and column name 2015-12-08 11:04:28 +01:00
Joas Schilling
a3391248e4 Add select distinct to the query builder 2015-12-08 09:49:21 +01:00
Joas Schilling
f2c7acb3c0 Allow getting the last insert id without much hassle 2015-12-08 09:40:20 +01:00
Jenkins for ownCloud
736e133c04 [tx-robot] updated from transifex 2015-12-08 01:56:19 -05:00
Thomas Müller
b15d77c934 Merge pull request #21015 from owncloud/update-redirecttocorrectpage 
Redirect to correct URL after updating
 2015-12-07 19:55:45 +01:00
Thomas Müller
4100263bd6 Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-when-not-possible 
Issue 12215 remove password reset when not possible
 2015-12-07 19:55:26 +01:00
Vincent Petry
69ab047f89 Redirect to correct URL after updating 
Now requires a trailing slash to make sure we don't land on the
forbidden page.
 2015-12-07 18:08:00 +01:00
Thomas Müller
bec34f1275 Merge pull request #21006 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-12-07 17:49:43 +01:00
Thomas Müller
77958bb601 Merge pull request #21009 from owncloud/share-forbidlinkshare-duplicatefield 
Fix duplicate bogus share field when link sharing is not allowed
 2015-12-07 17:49:24 +01:00
Thomas Müller
0f30908aa3 Merge pull request #21011 from owncloud/allow-ico 
Allow .ico files
 2015-12-07 17:49:03 +01:00
Thomas Müller
000523a7fe Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_filter_as_deleted 
treat LDAP users not available by user filter as deleted
 2015-12-07 17:47:10 +01:00
Lukas Reschke
37efc1d1e1 Allow .ico files 
Makes `/core/img/favicon.ico` accessible again via web.
 2015-12-07 17:15:04 +01:00
Thomas Müller
939ba745ee Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rules 
Disabled checked checkbox css rules
 2015-12-07 17:11:26 +01:00
Thomas Müller
48cc4b4511 Merge pull request #21004 from owncloud/adding-mention-bot 
Adding a basic configuration for the mention bot
 2015-12-07 17:11:01 +01:00
Vincent Petry
6735005be0 Fix duplicate bogus share field when link sharing is not allowed 
Whenever link share is not allowed, it was outputting a bogus sharing
field which name would conflict with the regular sharing field.

This fix makes sure that the bogus sharing field with "Resharing not
allowed" message only appears when triggered by removed share
permissions.
 2015-12-07 16:53:56 +01:00
Thomas Müller
7dd1874188 Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen 
Improving fopen behaviour for Swift backend
 2015-12-07 16:50:07 +01:00
Scrutinizer Auto-Fixer
453e1bf66e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 15:43:36 +00:00
Thomas Müller
548a7f3c04 Adding a basic configuration for the mention bot 2015-12-07 16:35:20 +01:00
Thomas Müller
e4c5bf790d Merge pull request #20987 from owncloud/dont-deprecate-OC.filePath-master 
OC.FilePath has still a valid use case when generating paths to stati…
 2015-12-07 16:25:53 +01:00
Thomas Müller
3c0b584093 Merge pull request #20998 from owncloud/add-csp-header-to-static-resources 
Add CSP header to static resources
 2015-12-07 16:23:38 +01:00
Thomas Müller
663f31b127 Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten 
Do not overwrite the language when it's just missing for one app
 2015-12-07 16:19:21 +01:00
Lukas Reschke
7b9bc721e9 Add CSP header to static resources 
Fixes https://github.com/owncloud/core/issues/16164
 2015-12-07 15:50:09 +01:00
Joas Schilling
87bc02c6cd Allow specifying a custom reset-password-url 2015-12-07 15:41:40 +01:00
Thomas Müller
857030d139 Merge pull request #20988 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-12-07 15:17:38 +01:00
Thomas Müller
a9e5faf7d0 Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-sharelink 
Allow sending a share email to multiple users
 2015-12-07 15:17:19 +01:00
Joas Schilling
f8f3c9ecf9 Remove password reset when the user can not change the password 2015-12-07 15:14:19 +01:00
Joas Schilling
57cd5209ca Add rules for checked+disabled and disabled checkbox style 2015-12-07 14:57:03 +01:00
Joas Schilling
c6dbe8ac63 Do not overwrite the language when it's just missing for one app 2015-12-07 14:46:53 +01:00
Scrutinizer Auto-Fixer
97f9213da9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 12:05:27 +00:00
Thomas Müller
9c550a07ed OC.FilePath has still a valid use case when generating paths to static files what for generateUrl cannot be used for - closes #15604 2015-12-07 12:23:42 +01:00
Joas Schilling
820c3b852d Add a unit test for single user case as well 2015-12-07 12:01:02 +01:00
Joas Schilling
5b87413792 Allow sending a share email to multiple users 2015-12-07 10:49:34 +01:00
Thomas Müller
e44b164f40 Merge pull request #20569 from owncloud/issue_20427 
Show external storage status in file list + prompt credentials if different
 2015-12-07 10:27:35 +01:00
Thomas Müller
22843fc6e3 Merge pull request #20796 from owncloud/cleanup-trashbin-code 
Cleanup trashbin expire code
 2015-12-07 10:24:09 +01:00
Thomas Müller
00b592f2a6 Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale 
Fix hidpi previews on public page
 2015-12-07 10:23:58 +01:00
Thomas Müller
cd6bc79c40 Merge pull request #20530 from owncloud/icons-more 
add icons for disabled checkbox, radio button, error and colored checkmark
 2015-12-07 10:22:49 +01:00
Thomas Müller
30bd915c0e Merge pull request #20480 from owncloud/css-prefixes 
CSS prefixes
 2015-12-07 10:21:35 +01: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 +01: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 +01: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 +01:00
Tim Dettrick
35ab7f0e64 Improving fopen behaviour for Swift backend 2015-12-07 10:20:09 +01: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 +01:00
Thomas Müller
085f3f58fa Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_available 
Settings user only load avatar if available
 2015-12-07 10:19:38 +01: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 +01: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 +01:00
Jenkins for ownCloud
884946276e [tx-robot] updated from transifex 2015-12-07 01:54:35 -05:00
Jenkins for ownCloud
d14f128329 [tx-robot] updated from transifex 2015-12-06 01:54:33 -05:00
Jenkins for ownCloud
f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00
Morris Jobke
4548a0aa90 Remove OC_Util::getUrlContent and replace by proper usage of public interfaces 2015-12-04 18:02:47 +01:00
Morris Jobke
46a6c6d70b remove OC_App::getActiveNavigationEntry - not unsed anymore 2015-12-04 17:26:28 +01:00