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

7819 Commits

Author SHA1 Message Date
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Jenkins for ownCloud a418a3ba65 [tx-robot] updated from transifex 2012-11-15 00:03:50 +01:00
Bernhard Posselt 14d4af24a2 Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading" 
This reverts commit 9b8375cf2c.
 2012-11-14 23:09:15 +01:00
Bernhard Posselt 9b8375cf2c Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-14 22:37:21 +01:00
Lukas Reschke 8b03b683df Merge pull request #271 from owncloud/239_webdav_999_files 
fixes #239 - query the database in chunks of 200
 2012-11-14 10:53:00 -08:00
Thomas Müller 49f05dfade Merge pull request #402 from zimba12/master 
Uncomment hours entries in relative date functions
 2012-11-14 05:36:04 -08:00
Thomas Müller e06513d76b Fixing syntax error - closes #406 2012-11-14 11:17:21 +01:00
Thomas Müller 99af3433d1 Fixing syntax error - closes #406 2012-11-14 11:10:31 +01:00
Alessandro Cosentino 7d01342bab fix translation issues with previous commit 2012-11-13 19:32:26 -05:00
Alessandro Cosentino aa917cfb18 uncomment hours entries in relative date functions 2012-11-13 19:18:26 -05:00
Thomas Tanghus c353568ea0 Merge pull request #41 from owncloud/vcategories_db 
OC_VCategories - this time actually usable ;)
 2012-11-13 15:40:46 -08:00
Jenkins for ownCloud 9c36326e47 [tx-robot] updated from transifex 2012-11-14 00:03:38 +01:00
Thomas Tanghus bfb6faa850 Bump version to trigger update. 2012-11-13 12:11:18 +01:00
Thomas Tanghus 34a7e81ffb Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-13 12:10:49 +01:00
Bart Visscher ad85087fcc Use util function to protect datadirectory in setup 2012-11-13 08:54:19 +01:00
Jenkins for ownCloud ac22cd4ab0 [tx-robot] updated from transifex 2012-11-13 00:07:19 +01:00
icewind1991 66dfe270c6 Merge pull request #319 from owncloud/fileactions_newfile 
Add fileactions to new files and folders
 2012-11-12 14:57:06 -08:00
Thomas Tanghus 268a48479d Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 23:36:59 +01:00
Thomas Tanghus c127c78df4 Don't use indexes in test data as postgres complains over duplicate keys. 2012-11-12 23:35:42 +01:00
Thomas Tanghus d809efc1e5 Change insertIfNotExist() for sqlite. Not fast, but more reliable than previous attempt. 2012-11-12 23:34:02 +01:00
Bart Visscher 7b53c9d3f0 Merge pull request #157 from owncloud/setup 
Make lib/setup.php usable outside of install setup
 2012-11-12 13:23:31 -08:00
Brice Maron 910a25adbd Fix deleting multiple user w-o reloading V2 2012-11-12 20:29:06 +00:00
Thomas Tanghus 42b871dcf1 Correct SQL syntax. 2012-11-12 18:45:56 +01:00
Arthur Schiwon d79e9a2da7 LDAP: cherrypick objectGUID handling from stable45, was part of PR 344 2012-11-12 17:00:23 +01:00
Lukas Reschke 89f2d4ba07 Merge pull request #368 from butonic/i18n_of_cancel_button 
add i18n for close button in the max upload size reached dialog
 2012-11-12 06:36:51 -08:00
blizzz e0fdb8272b Merge pull request #371 from butonic/sql_and_error_log_fixes 
add missing sql backticks, check sharing for error and add log
 2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer ba91f9a237 add missing sql backticks, check sharing for error and add log 2012-11-12 12:04:46 +01:00
Jörn Friedrich Dreyer bbef5b377e add i18n for cancel button 2012-11-12 10:52:28 +01:00
Thomas Tanghus 82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Jenkins for ownCloud 09d6d843f7 [tx-robot] updated from transifex 2012-11-12 00:02:24 +01:00
Thomas Tanghus 9ae6876884 Merge pull request #361 from owncloud/cruds_consts_2 
Implement "Move CRUDS permission consts to OC(P) namespace" take 2
 2012-11-11 14:31:50 -08:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus 7f0c69eb0e Added CRUDS permissions to the OCP namespace. Implements issue #345 2012-11-11 23:09:54 +01:00
Thomas Tanghus fd709fc021 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-11 20:20:09 +01:00
Thomas Müller 3be21cf665 Merge pull request #354 from michielbdejong/master 
add /.well-known/host-meta.json to .htaccess (for /apps/unhosted_apps)
 2012-11-10 21:17:13 -08:00
Michiel de Jong e37dd7aa82 add /.well-known/host-meta.json to .htaccess 2012-11-10 20:00:28 -06:00
Jenkins for ownCloud 9f8cc09642 [tx-robot] updated from transifex 2012-11-11 00:02:42 +01:00
Bart Visscher 04aa029cd3 Disable loading apps before starting tests 
The tests it self should load the app if needed
 2012-11-10 21:15:05 +01:00
Thomas Müller a7f26b6b40 Merge pull request #346 from diederikdehaas/patch-checkstyle-build1341 
Patch checkstyle issues from jenkins build1341
 2012-11-10 02:22:28 -08:00
Diederik de Haas eff13a28c1 Fixed new checkstyle issues in apps.php from build #1341. 2012-11-10 01:03:54 +01:00
Diederik de Haas 1b7c0c2b62 Fixed new checkstyle issues in ocs.php from build #1341. 2012-11-10 01:02:47 +01:00
Diederik de Haas f6daddadf5 Fixed new checkstyle issues in util.php from build #1341. 2012-11-10 00:58:03 +01:00
Diederik de Haas 20541c610e Fixed new checkstyle issues in migrate.php from build #1341. 2012-11-10 00:53:28 +01:00
Diederik de Haas 6e6df6e410 Fixed new checkstyle issues in ftp.php from build #1341. 2012-11-10 00:46:50 +01:00
Diederik de Haas 3cc6df489f Fixed new checkstyle issues in swift.php from build #1341. 2012-11-10 00:45:49 +01:00
Diederik de Haas 051635412d Fixed new checkstyle issues from build #1341. 2012-11-10 00:40:32 +01:00
Jenkins for ownCloud 7ec0efe5c2 [tx-robot] updated from transifex 2012-11-10 00:02:29 +01:00
Thomas Müller 6dbdc16287 Merge pull request #340 from butonic/fix_quota_zero_cornercase 
fix quota off by one error
 2012-11-09 05:54:50 -08:00
Jörn Friedrich Dreyer c5ba4f476a fix quota off by one error 2012-11-09 14:34:15 +01:00
Thomas Müller e23a11ab2f Merge pull request #337 from seidler2547/master 
Fix problem with apache2+fcgid install, e.g. on Debian Squeeze
 2012-11-09 05:31:22 -08:00