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

18447 Commits

Author SHA1 Message Date
Vincent Petry 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
Vincent Petry d4ffafe467 Removed simulate db update flag and split into separate methods 2014-06-04 18:17:46 +02:00
Vincent Petry 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
Morris Jobke 5adb8f0a8a Merge pull request #8844 from owncloud/design-icons 
[WIP] simplify icons, remove shadow
 2014-06-04 12:23:08 +02:00
Bernhard Posselt ade6ed3797 Merge pull request #8701 from owncloud/slide-up-toggle 
Create reusable data attribute for apps setting slideup
 2014-06-04 11:31:04 +02:00
Jan-Christoph Borchardt a244172219 Merge pull request #8853 from owncloud/design-typeface 
Use Open Sans as typeface
 2014-06-04 11:16:03 +02:00
Morris Jobke 8874c74a74 Merge pull request #8860 from owncloud/phpstorm-code-style 
add phpstorm code style
 2014-06-04 11:12:35 +02:00
Morris Jobke d3128f0694 IE -> IE8 only 2014-06-04 11:07:28 +02:00
Morris Jobke d1176f546a move from tff to woff and fix IE8 2014-06-04 10:58:52 +02:00
Robin Appelman 962cd50ae7 add phpstorm code style 2014-06-04 10:58:51 +02:00
Thomas Müller 4ab77f90d2 Merge pull request #8662 from owncloud/f-lock 
f-lock
 2014-06-04 10:26:02 +02:00
Thomas Müller 9e31118675 Merge pull request #8842 from owncloud/ldap_cli_methods 
command line tools to see, modify and test existing LDAP configurations
 2014-06-04 09:37:04 +02:00
Thomas Müller 86623358f0 Merge pull request #8849 from owncloud/trash_expire_fix 
get files in trash from file cache
 2014-06-04 09:36:40 +02:00
Thomas Müller 9f3fcf036c fixing typo 2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt 6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels 
Remove infieldlabels
 2014-06-04 09:28:20 +02:00
Thomas Müller 917f389747 workaround to get the unit test going 2014-06-04 08:21:28 +02:00
Jenkins for ownCloud f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Bjoern Schiessle 2c8288d8f9 get the storage from the view 2014-06-04 07:55:46 +02:00
ringmaster 0a417b1174 Use ->instanceOfStorage() not instanceof for Storage instances. 2014-06-04 07:55:46 +02:00
ringmaster 0e85618c42 Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead. 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 48eb0515e9 only lock if unlink is called for a file 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 2b30fb4862 fix unit test after adding the additional parameter to addStorageWrapper() 2014-06-04 07:55:46 +02:00
Bjoern Schiessle ab6680e9ab name the storage wrapper to make sure that we don't apply the wrapper multiple times 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 3a698bce6e don't ask for fileInfo if we already have one 2014-06-04 07:55:45 +02:00
ringmaster cda87fd9c4 Normalize lock exception messages. 2014-06-04 07:55:45 +02:00
Bjoern Schiessle e6712bc12e make sure to close the stream at the end of each test 2014-06-04 07:55:45 +02:00
ringmaster ba887d2b17 Restore the reference to this used exception class. 2014-06-04 07:55:45 +02:00
ringmaster 54865815f5 Move Lock to private namespace, add interface. Update PHPDoc. 2014-06-04 07:55:45 +02:00
ringmaster c9c6a0ab1e Don't error out on console. 2014-06-04 07:55:45 +02:00
ringmaster 392a1b6662 Removed unused vars/declarations, update PHPDoc. 2014-06-04 07:55:45 +02:00
Lukas Reschke 826b14e36b Fix typo 2014-06-04 07:55:45 +02:00
Lukas Reschke 9bbc4b0034 Fix typo 2014-06-04 07:55:44 +02:00
ringmaster 896bc526e6 Remove unused methods. 2014-06-04 07:55:44 +02:00
ringmaster 6b94732bdf Respect locked files, surface correct exception. 2014-06-04 07:55:44 +02:00
ringmaster 428510a4f8 Simpler log unique id. 2014-06-04 07:55:44 +02:00
ringmaster f9dbdb7c5c Add actual locking and log changes necessary for debugging. 2014-06-04 07:55:44 +02:00
ringmaster dc1e3620d2 Continued flock work. 2014-06-04 07:55:44 +02:00
ringmaster 5365ae416e flock changes. Work in progress. 2014-06-04 07:55:44 +02:00
Jan-Christoph Borchardt 0ec3f1dd2d unbold the username 2014-06-03 20:02:50 +02:00
Morris Jobke 3a1994d001 Merge pull request #8686 from owncloud/session-early 
Make the session available as early as possible
 2014-06-03 19:23:30 +02:00
Thomas Müller 6764d5b122 Merge pull request #8698 from owncloud/sharing_improve_permissions 
get permissions directly from share storage to avoid additional db calls
 2014-06-03 19:13:51 +02:00
Jan-Christoph Borchardt 29c5ec4fa6 do not use italic typeface style, instead lighter color 2014-06-03 19:12:31 +02:00
Thomas Müller 70ae7fa091 Fix casing and PHPDoc 2014-06-03 19:10:18 +02:00
blizzz 21d1e5eccc Merge pull request #7930 from owncloud/fix_7785_master 
LDAP: put out fetching of user meta data into a fully tested class of it...
 2014-06-03 19:09:33 +02:00
Jan-Christoph Borchardt 80627dfd2c use Open Sans as typeface 2014-06-03 19:07:08 +02:00
icewind1991 cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group 
Add the option to enable apps only for specific groups
 2014-06-03 19:01:12 +02:00
Thomas Müller e4c3ff03d6 Merge pull request #8809 from owncloud/appconfig-caching 
Improve caching in AppConfig
 2014-06-03 18:59:37 +02:00
Morris Jobke f87a91fa00 Merge pull request #8837 from owncloud/issue/8720 
Fix cursor and background of app navigation
 2014-06-03 16:46:04 +02:00
Bjoern Schiessle 05cf34ea1f get files in trash from file cache 2014-06-03 16:45:11 +02:00
Thomas Müller cfc1d5623e Merge pull request #8840 from owncloud/share_settings 
by default don't show option to send mail notifications for shares
 2014-06-03 16:42:44 +02:00