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

6993 Commits

Author SHA1 Message Date
Robin Appelman f1091280de Merge pull request #10184 from owncloud/getbyid-node 
Fix Folder::getById
 2014-08-07 13:40:17 +02:00
Thomas Müller d2365afad6 Merge pull request #8915 from owncloud/MorrisJobke-travis 
Travis support for PRs and master, stable5 and stable6
 2014-08-07 11:33:13 +02:00
Jenkins for ownCloud 2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Volkan Gezer 173538befb typo fix from transifex suggestion 2014-08-06 20:48:26 +02:00
Robin Appelman 12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00
Robin Appelman 1deb6aadd3 return null instead of throwing an exception 2014-08-06 12:06:41 +02:00
Thomas Müller a72dae6842 Merge pull request #10144 from owncloud/issue/9972 
Issue/9972 Fix issues with group and username `0`
 2014-08-06 09:53:13 +02:00
Jenkins for ownCloud e902e3f659 [tx-robot] updated from transifex 2014-08-06 01:54:43 -04:00
Morris Jobke 9fb79c86f0 Merge pull request #10191 from owncloud/sharing_rm_trailing_slash 
[sharing] remove trailing slash
 2014-08-05 23:13:35 +02:00
Bjoern Schiessle 48c57b80e3 remove trailing slash from path 2014-08-05 20:34:32 +02:00
Björn Schießle d35bfc9a4c Merge pull request #9520 from owncloud/theme_urls 
Add ability to theme iOS and Android client URLs just like desktop URLs.
 2014-08-05 17:53:18 +02:00
Robin Appelman bf8f910a32 Fix Folder::getById 2014-08-05 16:58:10 +02:00
Morris Jobke 676fa459d7 Minor fixes 
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
 2014-08-05 16:53:28 +02:00
Robin Appelman 244d4e1399 Make View->shouldEmitHooks more robust 2014-08-05 16:53:28 +02:00
Morris Jobke 8561d0dfca remove escaping because it's unneeded 2014-08-05 13:18:38 +02:00
Morris Jobke 7b222c4ab5 fix uppercase issue 2014-08-05 13:16:51 +02:00
scolebrook 2e127d2c5e Add ability to theme iOS and Android client URLs just like desktop URLs. 2014-08-05 13:16:51 +02:00
Bjoern Schiessle 41cca70a63 don't display share permission if resharing was disabled by the admin 2014-08-05 10:57:51 +02:00
Morris Jobke c0e78d9841 Merge pull request #10151 from owncloud/issue/9912 
Increase word wrap limit for emails to 78 characters
 2014-08-05 08:20:57 +02:00
Jenkins for ownCloud 5ecbc27753 [tx-robot] updated from transifex 2014-08-05 02:05:17 -04:00
Joas Schilling f4c7e3c1e9 Merge pull request #10083 from th3fallen/fix-9969-take-two 
Fix 9969
 2014-08-04 17:41:03 +02:00
Thomas Müller 66a3a641b9 Merge pull request #10138 from owncloud/innodb-repair-non-oc 
Dont touch non-oc tables when doing the InnoDB repair step
 2014-08-04 16:23:46 +02:00
Joas Schilling c1b8d93cb0 Increase word wrap limit for emails to 78 characters 2014-08-04 16:05:09 +02:00
Joas Schilling 4865c52aa6 Fix isLoggedIn() check for user '0' 
Fix #9972
 2014-08-04 15:53:55 +02:00
Joas Schilling f80baf03d4 Fix getting group '0' from database backend 
Fix #9972
 2014-08-04 15:53:55 +02:00
Robin Appelman ca463f9c10 Dont touch non-oc tables when doing the InnoDB repair step 2014-08-04 13:14:12 +02:00
Thomas Müller 65903a012a Merge pull request #10025 from owncloud/l10n-typo 
typo fix from transifex suggestion
 2014-08-04 11:03:50 +02:00
Jenkins for ownCloud d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Volkan Gezer 7a07690b25 expire -> expiration 2014-08-02 04:02:39 +02:00
Jörn Friedrich Dreyer a0ab4c2434 fix return documentation 2014-08-01 13:42:35 +02:00
Thomas Müller 378f35f0ec prevent PHP errors and enhance logging 2014-08-01 09:54:32 +02:00
Jenkins for ownCloud 86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04:00
Volkan Gezer 5f015067f4 suggestions by deepdiver 2014-08-01 01:39:52 +02:00
Clark Tomlinson 26af116fcd Removing unnecessary switch statements in fopen methods. 2014-07-31 09:34:27 -04:00
Thomas Müller 4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text 
Use svg mimeicons for empty text files
 2014-07-31 11:38:29 +02:00
Jenkins for ownCloud c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Jan-Christoph Borchardt 5b11a18dea Merge pull request #10044 from owncloud/transparency_fix 
extract transparency fix from #8050
 2014-07-30 18:36:51 +02:00
Morris Jobke 521934ee0d Merge pull request #10029 from owncloud/fix-thirdparty 
Fix silent crash if 3rdparty dir is not available
 2014-07-30 18:34:55 +02:00
Morris Jobke 62b37fbb99 Merge pull request #10024 from owncloud/preview-restrict-height 
Also keep maxY into account when scaling a preview while preserving aspect ratio
 2014-07-30 17:22:20 +02:00
Jörn Friedrich Dreyer dd9347fdd2 Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload 
Cache factory needs to use globalPrefix in createLowLatency()
 2014-07-30 16:56:45 +02:00
Robin Appelman 4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Georg Ehrke fa461befbc extract transparency fix from #8050 2014-07-30 16:13:33 +02:00
Morris Jobke 38e309b0fe Merge pull request #9970 from owncloud/sharing_set_expire_date 
Sharing set expire date
 2014-07-30 14:37:16 +02:00
Volkan Gezer 90d8f42d7c typo fix from transifex suggestion 2014-07-30 14:07:32 +02:00
Victor Dubiniuk eb9bd200fa Replace exit with return 2014-07-30 14:03:31 +02:00
Victor Dubiniuk 31e7fdb9bf Fix silent crash if 3rdparty dir is not available 2014-07-30 14:03:31 +02:00
Robin Appelman c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Thomas Müller 54d5d03271 Merge pull request #9888 from owncloud/mysql-tinyint-master 
migration test for sqlite - adding type mapping for 'tinyint unsigned'
 2014-07-30 11:48:10 +02:00
Thomas Müller 7d6221d25d Merge pull request #9914 from owncloud/fix-appframework-blank-template 
Fix template rendering for 'blank' templates
 2014-07-30 10:31:15 +02:00
Jenkins for ownCloud 47e72917e5 [tx-robot] updated from transifex 2014-07-30 01:55:32 -04:00