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

4371 Commits

Author SHA1 Message Date
Thomas Müller 7279a07ca2 Merge branch 'master' into mimetype-defaults 
Conflicts:
	apps/files/ajax/newfile.php
 2013-08-16 00:13:10 +02:00
Thomas Müller ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Markus Goetz 3972198b61 Cache OC_Util::checkServer() result in session 
The return value almost never changes but this function
is called for every request.
 2013-08-15 11:58:09 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Thomas Tanghus ca495758bd Fix octemplate string escaping. 2013-08-14 23:06:43 +02:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals 
Use plural translations
 2013-08-14 10:23:19 -07:00
Bjoern Schiessle 6c3efaf26c throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files 2013-08-14 09:44:29 +02:00
Bjoern Schiessle 53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
Robin Appelman f22719b1ee Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 15:37:39 +02:00
Jenkins for ownCloud 5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Andreas Fischer 43be3eb4d0 Changing elseif statement to what the PEAR coding guidelines say. 2013-08-09 22:32:38 +02:00
Andreas Fischer 9c22046bff Do not pass numeric strings to strtotime() when formatting dates. 
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
 2013-08-09 22:32:38 +02:00
kondou b24b208dce Throw exceptions instead of only logging in \OC_Installer::installApp() 2013-08-09 21:57:01 +02:00
kondou 9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
kondou 80e9744da0 Merge branch 'master' into improve_app-management 2013-08-09 18:02:40 +02:00
kondou 605050df9b Log exception at the catching code 2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt 4c0ec974b9 Merge pull request #4344 from owncloud/appmgmt-in-navigation 
show 'More apps' link to app administration directly in app navigation
 2013-08-09 08:49:41 -07:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Valerio Ponte 881e362f93 final fix for xsendfile zip generation race condition 2013-08-08 23:34:04 +02:00
Owen Winkler a2ac5e0163 Merge pull request #4271 from owncloud/plural_translations 
Plural translations
 2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer e38025ba67 Merge pull request #4151 from owncloud/doctrine-object 
Move dbtype depending logic into object per type
 2013-08-08 08:46:30 -07:00
Björn Schießle c24bf47db8 Merge pull request #4349 from owncloud/oc_cache_fix 
oc_cache needs to disable file proxys for read/write operation.
 2013-08-08 08:19:14 -07:00
Morris Jobke 062769ab61 Remove noisy Log/Debug message 2013-08-08 16:39:33 +02:00
Bjoern Schiessle df358dfef5 fix function call for searUsers() 2013-08-08 13:41:04 +02:00
Thomas Müller fed1792510 adding unit tests for quota checks 2013-08-08 13:33:00 +02:00
Thomas Müller d3a69bf4c6 adding unit tests to determine length 2013-08-08 11:04:40 +02:00
Bjoern Schiessle ab6e47b44a oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work. 2013-08-08 09:44:19 +02:00
Thomas Müller fb890eee67 fixes #4343 2013-08-08 00:42:28 +02:00
Bart Visscher d563367b0f More style fixes 2013-08-07 22:22:33 +02:00
Bart Visscher 83988a5906 Fix stupid bug 2013-08-07 21:01:31 +02:00
Bart Visscher 0783267e2c Move query processing after the check for prepared statement cache 2013-08-07 18:21:49 +02:00
Jan-Christoph Borchardt 367b248bc0 show 'More apps' link to app administration directly in app navigation 2013-08-07 18:18:09 +02:00
Bart Visscher 2cc94cbc73 Style fixes 2013-08-07 18:17:37 +02:00
Robin Appelman a0243e03ef use === 2013-08-07 17:17:30 +02:00
Robin Appelman 9321eceed6 add the option to have templates for newly created files 2013-08-07 16:53:09 +02:00
Robin Appelman fc332acf8a split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings 2013-08-07 16:38:57 +02:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
kondou 1a4465f41d Improve app-management 
- Better error messages

- Translate untranslated strings

Basically picks non-app-dependency related stuff from #4017
 2013-08-06 17:19:18 +02:00
Robin Appelman 95a959b10b merge master into doctrine-object 2013-08-06 15:43:58 +02:00
Bart Visscher 9b6357e6aa Merge pull request #4291 from owncloud/schema 
update DB Schema class
 2013-08-05 11:29:52 -07:00
Thomas Müller 464afb5eca use isset to prevent undefined index 2013-08-05 13:51:45 +02:00
Thomas Müller d1a39ab01c Merge pull request #4293 from owncloud/config-date 
make log date configurable, default to iso 8601
 2013-08-04 15:18:05 -07:00
Thomas Müller b5f18111f4 Merge pull request #4308 from owncloud/fix-4194 
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
 2013-08-04 15:16:32 -07:00
Thomas Müller 0ae2bb77ba Merge pull request #4228 from owncloud/fix-3836 
app migrate: Use = instead of LIKE as described in the comment above.
 2013-08-04 15:00:24 -07:00
Thomas Müller 33d78ab9c7 fixing PHPDoc 2013-08-04 23:13:34 +02:00
Thomas Müller b716d035c3 fixing PHPDoc 2013-08-04 22:58:40 +02:00
Jan-Christoph Borchardt 5a77b67147 change long couldn't be determined string to question mark again 2013-08-04 16:27:17 +02:00
Andreas Fischer e03d9e3aa0 Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog. 2013-08-04 02:48:00 +02:00
Thomas Müller b229381dda initialize $plural_form_string with English default 2013-08-03 23:29:31 +02:00
Robin Appelman 3534c3b373 add reveal mimetype 2013-08-03 21:59:44 +02:00
Thomas Müller e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
Thomas Müller 35a42da3ca PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction 2013-08-02 21:46:25 +02:00
Thomas Müller afc8ee721d Merge pull request #4299 from owncloud/simplify-db-transaction 
Simplify OC_DB transaction functions
 2013-08-02 12:32:41 -07:00
Robin Appelman 2af27434a4 merge master into doctrine-object 2013-08-02 19:53:04 +02:00
Bart Visscher fd317f599b Simplify OC_DB transaction functions 2013-08-02 16:12:34 +02:00
Bart Visscher 5ffb8fac24 Use function to create schema manager 2013-08-02 16:02:33 +02:00
Thomas Müller 821a99b937 Merge pull request #4287 from Takuto88/language-config 
Make default language configurable via config.php
 2013-08-02 06:49:54 -07:00
Robin Appelman 258e54182a remove invalid type hinting and cleanup namespaces a bit 2013-08-02 15:09:50 +02:00
Bernhard Posselt f5c3a346b0 make log date configurable, default to iso 8601 2013-08-02 13:34:20 +02:00
Bart Visscher 59c5529a2b Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager 2013-08-02 13:19:27 +02:00
Bart Visscher 9432885428 Change OC_DB_Schema to use DI for db connection object 2013-08-02 13:14:18 +02:00
Lennart Rosam 79351d064f Make default language configurable via config.php 2013-08-02 09:41:31 +02:00
Jakob Sack 2f17dcdba8 Fix syntax error. 2013-08-01 21:46:52 +02:00
Jakob Sack eee2c369d9 Fix copy and paste errors in l10n.php 2013-08-01 21:36:33 +02:00
Jakob Sack 9673a563b5 Create plural functions on the fly 2013-08-01 21:25:14 +02:00
kondou 1b567b2ad1 Don't throw a fatal, if is_file() parameter isn't 
a 'valid path', but only a data/base64-string.

Related to #4283
 2013-08-01 21:01:26 +02:00
Jakob Sack 495e44e76c Update l10n.php to read plural_forms string 2013-08-01 19:54:51 +02:00
Jörn Friedrich Dreyer eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Bjoern Schiessle 9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Morris Jobke 30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Morris Jobke 0d69feb12e Merge pull request #4208 from owncloud/scanner-php53 
Fix scanner hooks throwing errors
 2013-08-01 00:05:56 -07:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Bjoern Schiessle 99354f9a28 fix searchUsers() call in group.php 2013-07-31 11:34:22 +02:00
Morris Jobke 50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Thomas Müller f35aadb576 Merge pull request #4227 from owncloud/fixing-testGetById-master 
implement a platform independent version of basename
 2013-07-30 08:39:53 -07:00
Thomas Müller 17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller 085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
icewind1991 7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance 
Cache: don't check if the parent exists in the cache if we are already sure it does
 2013-07-29 13:08:23 -07:00
Andreas Fischer 89f8f8e42d app migrate: Use = instead of LIKE as described in the comment above. 
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
 2013-07-29 18:41:22 +02:00
Robin Appelman 74c54587ec better variable naming 2013-07-29 18:27:19 +02:00
Thomas Mueller e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
Robin Appelman dea3472ad7 remove unneeded 'use' 2013-07-29 17:04:28 +02:00
Robin Appelman 64774f30ba dont need to explicitly pass by reference 2013-07-29 17:03:57 +02:00
Robin Appelman d6c56b584a make MDB2Schema reader non static 2013-07-29 16:33:00 +02:00
Robin Appelman fbbe0ebe77 add function to get config object from OC_Config 2013-07-29 16:32:37 +02:00
Michael Gapczynski 1faac6108c Use query to calculate folder size 2013-07-29 10:22:44 -04:00
Thomas Müller 954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache 
Also clean PHP 5.5 opcache
 2013-07-29 04:40:01 -07:00
Jörn Friedrich Dreyer 05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Michael Gapczynski dd4e33fe6b Fix calculating size for empty folders 2013-07-28 16:14:49 -04:00
Michael Gapczynski c8e60900fc Move check so the variable will never be undefined 2013-07-28 15:32:48 -04:00
kondou 8cd671c207 Also clean PHP 5.5 opcache 2013-07-28 16:33:03 +02:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Robin Appelman e1e7b6a940 Cache: don't check if the parent exists in the cache if we are already sure it does 2013-07-27 11:36:27 +02:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Bart Visscher d7916363e1 Make DB connection available to use for dependency injection 2013-07-26 20:36:48 +02:00
Robin Appelman 59bdba9bac fix scanner hooks, cant use inside closures in php 5.3 2013-07-26 15:43:10 +02:00
Robin Appelman 88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00