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

1738 Commits

Author SHA1 Message Date
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
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
Joas Schilling f4c7e3c1e9 Merge pull request #10083 from th3fallen/fix-9969-take-two 
Fix 9969
 2014-08-04 17:41:03 +02:00
Joas Schilling c1b8d93cb0 Increase word wrap limit for emails to 78 characters 2014-08-04 16:05:09 +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
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
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
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 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
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
Andreas Fischer 9be8ac5867 Memcache\Factory: Remove static, use globalPrefix. 2014-07-29 11:14:36 +02:00
Bjoern Schiessle 67e302885c remove share permission if user is excluded from sharing 2014-07-29 10:08:08 +02:00
Thomas Müller 58472a2660 migration test for sqlite - adding type mapping for 'tinyint unsigned' 2014-07-29 09:18:37 +02:00
Bjoern Schiessle 4e87ac2bb9 make sure that we set the expire date if a date is adefault date is set 2014-07-28 22:45:03 +02:00
Björn Schießle c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Morris Jobke 1fbbaed261 Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster 
generate copy of sqlite database file in data directory
 2014-07-28 16:54:52 +02:00
Robin Appelman cb0ff19dc4 Merge pull request #9924 from owncloud/eventsource-nginx-buffering 
Prevent nginx from buffering event source events
 2014-07-28 16:17:35 +02:00
Thomas Müller 539d2b7ec3 Merge pull request #9784 from josh4trunks/libreoffice_match_cl 
Cleanup Document Preview
 2014-07-28 13:03:33 +02:00
Thomas Müller a3411e3719 Merge pull request #9641 from owncloud/localuser-addressbook 
ownCloud users are exported as address book
 2014-07-28 12:18:56 +02:00
Thomas Müller 534fb9ebf9 Merge pull request #9631 from owncloud/update-getid3 
update getID3 library
 2014-07-28 11:51:36 +02:00
Thomas Müller 11214219f3 Merge pull request #9819 from owncloud/updater-setversionafterupdate 
Set version AFTER a successful update
 2014-07-28 11:19:57 +02:00
Thomas Müller 0aa652ecfd Merge pull request #9859 from tiezdne/master 
Update mimetypes.list.php
 2014-07-28 11:16:43 +02:00
Thomas Müller cfaa05cc0e Merge pull request #9905 from owncloud/joblist-non-existing-class 
Dont try to execute jobs that no longer exist
 2014-07-28 11:09:27 +02:00
Thomas Müller ab8efe3aa2 Merge pull request #9935 from owncloud/harden-get-urlco 
Verify whether the URL is valid
 2014-07-28 11:07:41 +02:00
Thomas Müller c87f425fe7 generate copy of sqlite database file in data directory 2014-07-28 10:29:39 +02:00
Thomas Müller f2982b7a08 Merge pull request #9904 from owncloud/loggedout-getuserfolder 
Dont throw an error when calling $server->getUserFolder when logged out
 2014-07-28 10:04:01 +02:00
Lukas Reschke 260729fd7d Verify whether the URL is valid 
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017

@karlitschek Backport for stable6 and stable7 requested.
 2014-07-27 16:46:32 +02:00
Robin Appelman 2c4e06d325 Prevent nginx from buffering event source events 2014-07-26 16:07:11 +02:00
Robin Appelman 43978befda Dont try to execute jobs that no longer exist 2014-07-25 18:02:02 +02:00
Robin Appelman acafb4a426 Merge pull request #9669 from owncloud/group-public 
Add group management to the public api
 2014-07-25 17:55:12 +02:00
Robin Appelman bf12bba079 Dont throw an error when calling $server->getUserFolder when logged out 2014-07-25 17:52:50 +02:00
Morris Jobke ae3761f15d add autoload 2014-07-25 17:37:33 +02:00
Morris Jobke a9666c4f5b update getID3 library 2014-07-25 15:25:45 +02:00
Bjoern Schiessle ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00