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

11928 Commits

Author SHA1 Message Date
Björn Schießle 7a575cc2d7 short explanation about OC_Defaults 2013-06-12 16:33:09 +02:00
Björn Schießle 7273f38af6 make pub link share footer aware of different owncloud editions 2013-06-12 16:28:47 +02:00
Björn Schießle 839bce80c6 make main menu aware of the different owncloud editions 2013-06-12 16:20:23 +02:00
Björn Schießle 5c6a854489 add default doc url 2013-06-12 16:19:28 +02:00
Jörn Friedrich Dreyer f7dc07602b minor cleanup for exception handling 2013-06-12 15:48:22 +02:00
Björn Schießle e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Björn Schießle b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
Björn Schießle 918906f042 make footer aware of ownCloud editions 2013-06-12 14:49:30 +02:00
Jan-Christoph Borchardt 4cafe21aa4 apps management: change misleading + to ... 2013-06-12 14:49:23 +02:00
eMerzh e33f68ecb6 Correct escaping 2013-06-12 14:36:28 +02:00
Brice Maron edc255421c Try connection with specified db when postgres does not work 
Conflicts:

	lib/setup.php
 2013-06-12 14:36:07 +02:00
Björn Schießle 7c108edc36 mage page title aware of ownCloud edition 2013-06-12 14:33:24 +02:00
Björn Schießle df78085171 adapt test to the code changes 2013-06-12 14:00:53 +02:00
Jan-Christoph Borchardt c0568e0443 remove App management top bar and move buttons more contextually in the interface 2013-06-12 13:36:17 +02:00
Morris Jobke a39ecd5ea9 Merge pull request #3681 from owncloud/fix_ajax_removeuser.php 
Init language object before using it
 2013-06-12 04:23:52 -07:00
Thomas Müller 1abce78cb8 Merge pull request #3654 from owncloud/clean_up_exceptions 
Introduce more robust SQL execution and exception handling
 2013-06-12 04:13:12 -07:00
Jörn Friedrich Dreyer a2d3c030fb every test now has 15min to execute 
we don't want to check performance just yet. we just want to make jenkins end more reliably.
 2013-06-12 13:58:25 +03:00
Björn Schießle 40e74b5907 Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload 
disable proxys during ssl root cert upload to avoid encryption
 2013-06-12 03:55:10 -07:00
Björn Schießle c78a90fd54 use number of manipulated rows as idicator if it was possible to enter the migration mode 2013-06-12 12:21:11 +02:00
Björn Schießle 519508736d disable proxys during ssl root cert upload to avoid encryption 2013-06-12 10:37:09 +02:00
Björn Schießle de5eed4fb0 Merge branch 'master' of github.com:owncloud/core 2013-06-12 10:31:39 +02:00
Björn Schießle 506c9de5cd backport of 1fa76e53dc 2013-06-12 10:30:54 +02:00
Georg Ehrke a2fa91fdd5 init language object before using it 2013-06-12 09:40:13 +02:00
Jenkins for ownCloud aab3b7d8ea [tx-robot] updated from transifex 2013-06-12 03:05:58 +02:00
Jan-Christoph Borchardt d2773982d5 Merge pull request #3672 from owncloud/files-contrast 
Contrast fixes
 2013-06-11 11:11:55 -07:00
Jan-Christoph Borchardt cdedfb6f37 multiselect: up min-width of group multiselect to 150px 2013-06-11 18:23:29 +02:00
Jan-Christoph Borchardt 0bcb04398d multiselect: fixed 'add group' interface a bit 2013-06-11 18:21:13 +02:00
Jan-Christoph Borchardt 686797eb6d multiselect: more breathing space for entries 2013-06-11 18:08:47 +02:00
Jan-Christoph Borchardt 27996d1c64 multiselect: drop shadow for better focus 2013-06-11 18:04:33 +02:00
Jan-Christoph Borchardt 35e7b64cc2 multiselect: do not cut off group names 2013-06-11 18:04:11 +02:00
Jan-Christoph Borchardt e6a4721f64 checkstyle: add space after colon 2013-06-11 18:02:52 +02:00
Jan-Christoph Borchardt 09ff9b2a2c remove leading spaces 2013-06-11 18:01:50 +02:00
Jan-Christoph Borchardt b014509f41 move storage bar below clients showcase to make it more visible 2013-06-11 16:05:02 +02:00
Thomas Müller 51f8aa90d1 Merge pull request #3675 from owncloud/allow_autotest_to_run_10x 
allow autotest to run 10x times longer
 2013-06-11 06:59:57 -07:00
Jörn Friedrich Dreyer 48b5e3d498 allow autotest to run 10x times longer 2013-06-11 15:57:00 +02:00
Jörn Friedrich Dreyer 0eed1c980d Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2 
fix fetchRow checks to also work with MDB2
 2013-06-11 06:20:27 -07:00
Björn Schießle 20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/tests/crypt.php
 2013-06-11 15:19:02 +02:00
Thomas Müller db6080c5c6 Merge pull request #3673 from owncloud/gitignore-apps2 
gitignore apps2 folder as well
 2013-06-11 06:10:25 -07:00
Jan-Christoph Borchardt ab79480dc6 gitignore apps2 folder as well 2013-06-11 14:57:06 +02:00
Jan-Christoph Borchardt abfbd9b136 feedback for hover/tap on breadcrumbs 2013-06-11 14:51:29 +02:00
Jan-Christoph Borchardt 651f1b0995 better contrast and grouping for blocks in personal settings through darker background color 2013-06-11 14:51:06 +02:00
Jan-Christoph Borchardt 2a936670ce better contrast for controls bar 2013-06-11 14:50:23 +02:00
Jan-Christoph Borchardt 5d4ff0e537 better contrast for files list, darker greys for selection and hover 2013-06-11 14:49:34 +02:00
Jörn Friedrich Dreyer e238eeef6f Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons 
use to_char to allow comparing string to CLOB cloumns in oracle
 2013-06-11 05:34:55 -07:00
Jan-Christoph Borchardt 0872f641dd darker low threshold color for file size and age fading, better contrast 2013-06-11 14:30:13 +02:00
icewind1991 a89dedf70d Merge pull request #3671 from owncloud/fix_user_creation 
createUser() needs to return something; the user object or false
 2013-06-11 05:02:06 -07:00
Björn Schießle 118f2b3283 createUser() needs to return something; the user object or false 2013-06-11 13:48:17 +02:00
Morris Jobke 74825de0bc Merge pull request #3666 from owncloud/allow_null_in_text_columns 
db structure, allow null in columns for '' values
 2013-06-11 04:42:22 -07:00
Björn Schießle 3ec6b19cdf use constants for different migration status 2013-06-11 13:07:39 +02:00
Björn Schießle 5fafd55108 make sure that only one process can enter the migration mode 2013-06-11 12:03:50 +02:00