Commit Graph

9263 Commits

Author SHA1 Message Date
raghunayyar f7a0ab7d4f Style fixes on core/navigation Branch.
#rightcontent margin and button overlaps fixed.
2013-01-25 16:01:41 +05:30
Björn Schießle 9bb8e05839 get all display names 2013-01-25 11:05:00 +01:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Arthur Schiwon 3e99f12120 LDAP: make settings strings in JS translatable 2013-01-24 22:47:25 +01:00
Arthur Schiwon 2749a14171 LDAP: make it possible to enable/disable server configurations 2013-01-24 22:39:05 +01:00
Lukas Reschke 48e6ce7c56 Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master
drop SimpleTest compatibility
2013-01-24 08:06:39 -08:00
Thomas Mueller ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Björn Schießle 2fee1208ef add display name to title instead if login-ID 2013-01-24 15:49:23 +01:00
Björn Schießle dbb0d04073 restore file in the root folder if the origin folder is not writable 2013-01-24 15:29:22 +01:00
Arthur Schiwon 6bc7256966 LDAP: forgotten file for deleteConfig feature 2013-01-24 14:12:12 +01:00
Arthur Schiwon 5b9e181198 LDAP: implement deleteConfiguration feature 2013-01-24 14:11:53 +01:00
Björn Schießle d16574f070 new branch which introduces display names
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
Arthur Schiwon 3bf38c7a84 LDAP: add missing new LDAP Helper 2013-01-24 13:01:43 +01:00
Arthur Schiwon fccfdb2a52 LPAP: cleanup settings.php, it's already ajaxified 2013-01-24 13:01:20 +01:00
Arthur Schiwon b2ea78c00d LDAP: improve and cleanup settings JS 2013-01-24 13:00:40 +01:00
Arthur Schiwon b084ed6a42 LDAP: clean up, save configuration is now handled by Ajax 2013-01-24 12:46:10 +01:00
Arthur Schiwon 319dcd45e1 LDAP: Clear cache on saving settings 2013-01-24 12:44:30 +01:00
Arthur Schiwon 96949fc9dd LDAP: consolidate config prefix determination, autofill combo box in settings 2013-01-24 12:42:28 +01:00
Tom Needham b26279546c Simpler method for getting the first char 2013-01-24 10:49:48 +00:00
Tom Needham d89be72972 Remove some whitespace 2013-01-24 10:40:47 +00:00
Tom Needham 02f8c941f4 API: If key begins with '@' treat it as an xml attribute 2013-01-24 10:39:33 +00:00
Thomas Müller 1dac2ba496 Merge pull request #1286 from owncloud/ocs_api
Check that external api methods return instances of OC_OCS_Result
2013-01-24 02:37:40 -08:00
Lukas Reschke f9a9fc5670 Merge pull request #1265 from j-ed/master
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
Tom Needham 8f9d3cd01d Code style update 2013-01-23 23:39:29 +00:00
Jenkins for ownCloud 3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Arthur Schiwon b979bf6f1c LDAP: fix default 2013-01-23 23:46:55 +01:00
Arthur Schiwon 06c284f6cc LDAP settings: read configuration when another server config is chosen 2013-01-23 23:41:35 +01:00
Arthur Schiwon 83d9e1e2f0 make sure that Configuration is read when getConfiguration is called. And give back the appropriate result. 2013-01-23 23:40:21 +01:00
Lukas Reschke 293e7bdcf0 Notice about changing the standard policy 2013-01-23 13:44:43 +01:00
Lukas Reschke 0517465f4d Allow admins to change the CSP policy in the config file 2013-01-23 13:42:52 +01:00
Thomas Mueller b4c3dd84b4 update to jquery-ui 1.10.0 2013-01-23 11:37:52 +01:00
Lukas Reschke 846971ec11 Fix merge conflict 2013-01-23 11:33:25 +01:00
Lukas Reschke fe56e4df7d Fix merge conflict 2013-01-23 11:32:14 +01:00
Björn Schießle 6ab95e8e33 code clean-up 2013-01-23 11:30:42 +01:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Lukas Reschke 48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Thomas Mueller 5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Michael Gapczynski 9eecb91338 Merge pull request #1113 from owncloud/fix-issue-1085
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Robin Appelman f858381775 merge master into filesystem 2013-01-22 23:27:04 +01:00
Thomas Müller ec8609fa21 Merge pull request #1259 from TheSFReader/master
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
j-ed dcda792fbc Update config/config.sample.php
fixed an other typo.
2013-01-22 21:42:39 +01:00
j-ed dfa5f2de4d Update config/config.sample.php
Fixed type in line 70. Thank you for pointing me to that typo.
2013-01-22 21:33:01 +01:00
Robin Appelman 9a1f65aab1 Some style fixes 2013-01-22 20:58:09 +01:00
Robin Appelman 7330fcf5e8 Cache: make mounts overwrite existing folders, prevents duplicate entries 2013-01-22 20:57:15 +01:00
icewind1991 12e286b21c Merge pull request #1237 from owncloud/fix-template-tests
Remove unnecessary ob_end_clean() from template tests
2013-01-22 11:12:40 -08:00
Sam Tuke c18aec56e2 Merge pull request #1105 from owncloud/files_encryption
Files encryption
2013-01-22 09:51:19 -08:00
Björn Schießle 367aadb3b7 rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view 2013-01-22 18:34:59 +01:00
Sam Tuke aa648fca75 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke ca454f0228 Removed depreciated file 2013-01-22 17:15:51 +00:00