mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,560 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

16560 Commits

Author SHA1 Message Date
Joas Schilling d583d61b69 Merge pull request #7412 from owncloud/issue/7175 
Add button to send a test mail after changing the email settings
 2014-03-05 13:18:41 +01:00
Bjoern Schiessle 2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Bjoern Schiessle fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00
Vincent Petry 2cfd875e61 Merge pull request #7012 from owncloud/display-share-owner-master 
adding share owner information to the file list
 2014-03-05 12:43:10 +01:00
Morris Jobke a8ae2f10b9 Merge pull request #7554 from owncloud/issue/7304 
Fix position of eye icon on database password field
 2014-03-05 11:13:43 +01:00
Vincent Petry 6de370b64c Removed obsolete OC.Router stubs in specHelper 2014-03-05 10:27:15 +01:00
Joas Schilling 4ee4f0c365 Fix position of eye icon on database password field 
Fix #7304
 2014-03-05 10:22:35 +01:00
Joas Schilling 5b8cde48dc Add button to send a test mail after changing the email settings 
Fix #7175
 2014-03-05 10:01:34 +01:00
Thomas Müller 33b798c3d6 fixing js unit tests 2014-03-05 01:10:39 +01:00
Thomas Müller 7edd8df07f Merge pull request #7521 from owncloud/docstrings_2_kondou 
Fix some more docstrings
 2014-03-05 00:40:49 +01:00
Vincent Petry 1da90fab84 Merge pull request #7508 from owncloud/ldap-configkeycasing 
Fixed configkey casing for PostgreSQL
 2014-03-04 17:08:29 +01:00
Tom Needham 9986b470ee Merge pull request #7251 from owncloud/fix-ocsapi-getuser 
Add displayname for admins on external api
 2014-03-04 15:37:45 +00:00
Vincent Petry 620dd4afbd Merge pull request #7481 from tripflex/fix_downloadlink_spaces 
replace spaces in download link without encoding entire URL
 2014-03-04 16:33:41 +01:00
Robin Appelman a8c67dc675 Add caching for getLocalFile on remote storages 2014-03-04 15:44:58 +01:00
Thomas Müller f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string 
fix https://github.com/owncloud/core/issues/6825
 2014-03-04 14:30:30 +01:00
Frank Karlitschek 0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Raghu Nayyar 7c3f3cc933 Merge pull request #7522 from owncloud/email-field-wording 
update wording of email field
 2014-03-04 15:05:22 +05:30
Morris Jobke af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00
Thomas Müller 1cd0fd6e9e Merge pull request #7497 from owncloud/add-.scrutinizer.yml 
add .scrutinizer.yml
 2014-03-03 20:05:21 +01:00
Thomas Müller a86e229848 Remove duplicate row 2014-03-03 20:05:14 +01:00
Vincent Petry ad195a881e Merge pull request #7453 from owncloud/preview-fileinfo 
Cache the fileinfo in OC\Preview
 2014-03-03 18:52:25 +01:00
Vincent Petry 568c9cfe01 Merge pull request #7511 from owncloud/emailtemplatefix 
Fix mail template to use p() for colors
 2014-03-03 17:45:39 +01:00
Vincent Petry 25251d4bf7 Fix mail template to use p() for colors 
Now using p() instead of print_unescaped() for colors.
 2014-03-03 17:36:12 +01:00
kondou 5e3b6f1fd9 Fix some more docstrings 2014-03-03 17:32:29 +01:00
Frank Karlitschek 7983c90fdc Merge pull request #7500 from owncloud/theme-mailtemplate 
Enable theming of the mail template header
 2014-03-03 17:22:33 +01:00
Jan-Christoph Borchardt 11054c6bb0 Merge pull request #7502 from jbtbnl/master 
Do not override button background image
 2014-03-03 16:23:19 +01:00
Vincent Petry 761251dfc5 Merge pull request #7506 from owncloud/master-update3rdpartysubmoduleforlibxmlfix 
Update 3rdparty submodule pointer to include libxml fixes
 2014-03-03 16:17:37 +01:00
Vincent Petry fd5dec0298 Fixed configkey casing for PostgreSQL 2014-03-03 16:15:23 +01:00
Vincent Petry 9c688454df Update 3rdparty submodule pointer to include libxml fixes 2014-03-03 15:41:25 +01:00
Vincent Petry 79ae3c4527 Allow XML entity loader for MDB2 schema loader 
Forward port of 762b0d9 from stable6 to master
 2014-03-03 14:17:51 +01:00
jbtbnl e603164517 Do not override button background image 2014-03-03 14:07:44 +01:00
Vincent Petry 84a87b96af Merge pull request #7482 from owncloud/reset-3rdparty-submodule 
Update 3rdparty submodule
 2014-03-03 13:59:21 +01:00
Jan-Christoph Borchardt b8d0fc9494 make mail notification header color themable 2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt eac9eebfdb compress mail notification logo 2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt 607f205bda mail template: remove off-white background color to better blend into mail client 2014-03-03 12:21:08 +01:00
Thomas Müller dcae91429f add .scrutinizer.yml 2014-03-03 10:55:01 +01:00
Arthur Schiwon b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
Thomas Müller 5f711912a1 remove OC.Router.registerLoadedCallback() 2014-03-02 23:45:23 +01:00
Thomas Müller 9f087a2070 fixing download url in files app 2014-03-02 23:41:14 +01:00
Thomas Müller e1030c6b5f adding JSDoc + remove unused function 2014-03-02 23:15:37 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Morris Jobke 084050530c Merge pull request #7486 from owncloud/l10n_docstrings 
Fix some docstrings in l10n.php
 2014-03-01 10:38:48 +01:00
Thomas Tanghus eff7667d26 Merge pull request #7433 from owncloud/config_basic_auth 
Config to disable basic_auth username checking
 2014-03-01 06:08:32 +01:00
kondou 5d5306175f Fix some docstrings in l10n.php 2014-03-01 03:38:35 +01:00
Thomas Müller d802ae298f Update 3rdparty submodule 2014-02-28 19:11:40 +01:00
Vincent Petry 88c9ae129e Merge pull request #7480 from owncloud/sabredav-1.7.11 
Update SabreDAV to 1.7.11
 2014-02-28 19:07:31 +01:00
Myles McNamara 195bdff91f move replace to inside isset 2014-02-28 11:19:19 -05:00
Myles McNamara 4ab7f58745 replace spaces in download link without encoding entire URL 2014-02-28 11:15:49 -05:00