6bf06890e7
always return a bool in OC_App::updateApp
2014-06-10 13:56:05 +02:00
5d4f3baf56
fix php doc block
2014-06-10 13:51:20 +02:00
1ab9bdcaa0
remove unnecessary @return
2014-06-10 13:01:10 +02:00
a110973b3a
some additional type checks
2014-06-06 09:41:53 +02:00
498aa66648
add additional type check
2014-06-06 09:33:34 +02:00
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
fad3bd7fc0
reenable checkCode()
2014-06-05 16:32:46 +02:00
6aab50f8aa
fix unit tests
2014-06-05 16:32:12 +02:00
e1beb8c6c3
Merge pull request #8889 from owncloud/mtime-reuse
...
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
bbdcbb9911
Merge pull request #8866 from owncloud/flock-quotafix
...
Fixed quota wrapper to return the value from flock()
2014-06-05 13:11:45 +02:00
e34b51124b
Merge pull request #8894 from owncloud/public-share-js-overwrite
...
Dont overwrite OCA.Sharing
2014-06-05 13:04:30 +02:00
f955209a5a
Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
...
table files_trashsizes was still used in some locations -> removed
2014-06-05 13:00:50 +02:00
690e0b5070
Dont overwrite OCA.Sharing
2014-06-05 12:52:08 +02:00
d0eb8f8668
Merge pull request #8880 from owncloud/webdav-read-permissions
...
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
fdfba14405
Merge pull request #8883 from owncloud/files-slide-toggle
...
use slide toggle for files app
2014-06-05 11:33:56 +02:00
9dab6ec2ec
Fix uit tests
2014-06-05 11:31:55 +02:00
844c6c3328
use slide toggle for files app
2014-06-05 11:26:24 +02:00
bd373d9621
Merge pull request #7878 from owncloud/quota-extstorageswitch
...
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
e0c4e960d9
Merge pull request #8861 from owncloud/share-overview-linklist
...
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
f1bf06f8cf
Merge pull request #8884 from owncloud/move-flock-to-app
...
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
218131d30d
fix leading decimal Scrutinizer coding style issue
2014-06-05 10:52:06 +02:00
6fcd135d0e
table files_trashsizes was still used in some locations -> removed
2014-06-05 10:44:32 +02:00
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
71b86136c2
Merge pull request #8878 from owncloud/update-checkmigrationforapps
...
Simulate apps database schema update on upgrade
2014-06-05 10:28:30 +02:00
3e73251750
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 10:08:25 +02:00
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
e186871996
fix unit test template
2014-06-05 09:46:19 +02:00
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
e3cbcadbd8
fix first failing test
2014-06-05 00:40:15 +02:00
39eeb7def9
Merge pull request #8882 from owncloud/remove-placeholdercall
...
remove obsolete placeholder call, fix #8881
2014-06-05 00:07:13 +02:00
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
95fda3c17c
Do not load apps when upgrade is needed
...
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
2014-06-04 18:52:52 +02:00
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
e26936e94f
remove obsolete placeholder call, fix #8881
2014-06-04 18:44:12 +02:00
210a1ef7e6
add to app navigation after enabling
2014-06-04 18:22:40 +02:00
9eb177e8bc
Use the permissions exposed by ownCloud for webdav external storages
2014-06-04 18:19:52 +02:00
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
d4ffafe467
Removed simulate db update flag and split into separate methods
2014-06-04 18:17:46 +02:00
e734caecba
Merge pull request #8876 from owncloud/design-css-settings
...
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:52:10 +02:00
48eee0b432
use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface
2014-06-04 17:47:09 +02:00
00b7f365bc
remove not needed unlink in installer test
2014-06-04 17:18:20 +02:00
5b97369b00
Simulate apps database schema update on upgrade
...
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
2014-06-04 17:16:44 +02:00
71ba457372
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:05:44 +02:00
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
c6196c022d
Merge pull request #8875 from owncloud/app-css-relative
...
explicit position:relative for app-content, fixes first run layout
2014-06-04 16:51:43 +02:00
411e6525b1
remove obsolete position rule from files app
2014-06-04 16:50:55 +02:00
9c6f604321
explicit position:relative for app-content, fixes first run layout
2014-06-04 16:41:11 +02:00
Georg Ehrke
Thomas Müller
Vincent Petry
Robin Appelman
Jan-Christoph Borchardt
Bernhard Posselt
icewind1991
Jörn Friedrich Dreyer
Morris Jobke
Jenkins for ownCloud
Morris Jobke