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

21896 Commits

Author SHA1 Message Date
jknockaert 417e40d218 Merge remote-tracking branch 'origin/master' 
Conflicts:
	apps/files_encryption/lib/stream.php
 2015-02-19 16:08:33 +01:00
jknockaert d5ba6af259 back 2015-02-19 16:08:08 +01:00
jknockaert 470994ba1e OC8 version 2015-02-19 15:43:22 +01:00
jknockaert e426375114 update enc stream 2014-12-17 15:48:05 +01:00
Jan-Christoph Borchardt 532ba99f1c Merge pull request #12895 from owncloud/favorites-polish 
polish the Favorites design
 2014-12-17 13:42:20 +01:00
Jan-Christoph Borchardt e2977ff4c1 fix favorite star flickering on empty state page 2014-12-17 13:40:57 +01:00
Thomas Müller 77c4c2856a Merge pull request #12889 from owncloud/deprecation-time 
Deprecate old and replaced appframework apis
 2014-12-17 11:28:01 +01:00
Jan-Christoph Borchardt c7cf0d0386 fix file list summary left alignment 2014-12-17 11:08:39 +01:00
Jan-Christoph Borchardt 433d1de923 fix empty state for Favorites 2014-12-17 11:04:22 +01:00
Jan-Christoph Borchardt f2d7fad0fb put Favorites second in list, after 'All files' 2014-12-17 11:00:16 +01:00
Jenkins for ownCloud 6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Lukas Reschke 80ddb14d18 Merge pull request #12881 from owncloud/issue/12874-interface-timezone 
Move timezone logic out of server.php
 2014-12-16 22:58:23 +01:00
Thomas Müller 3072b43a55 Merge pull request #12890 from owncloud/add-fancy-translation 
Add some fancy translation chart
 2014-12-16 22:53:21 +01:00
Lukas Reschke 20c8a27c76 Add some fancy translation chart 
Probably useless - but at least it looks fancy.
 2014-12-16 19:55:42 +01:00
Bernhard Posselt d59c4e832f first round of deprecation 2014-12-16 19:50:31 +01:00
Joas Schilling 26100a6dfb Move timezone logic out of server.php 2014-12-16 16:16:22 +01:00
Jenkins for ownCloud 5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Lukas Reschke be3d4fd303 Merge pull request #12360 from owncloud/files-tags 
Add favorites to files app
 2014-12-15 19:55:18 +01:00
Vincent Petry 207d77e5cd Fixed small code style issues 2014-12-15 17:20:41 +01:00
Lukas Reschke 76357af2d5 Merge pull request #11946 from owncloud/load-vendor-from-core-json 
Implement method that reads vendor libs from core.json
 2014-12-15 16:18:38 +01:00
Jörn Friedrich Dreyer 6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search 
introduce inApps[] filter for search via ajax query
 2014-12-15 16:14:40 +01:00
Vincent Petry 976baed5f9 Remove spinner when toggling file favorite 2014-12-15 15:50:57 +01:00
Vincent Petry 33eb4483b2 Fixed has-favorites CSS 2014-12-15 15:18:29 +01:00
Jan-Christoph Borchardt fb220a1e09 shift actions to the left a bit to account for right shift due to favorites action, not not overlap with size info 2014-12-15 15:12:37 +01:00
Jan-Christoph Borchardt 4dbe8c6771 add CSS to shift header to account for when favorites are present 2014-12-15 15:11:51 +01:00
Morris Jobke 9f30d3529a Implement method that reads vendor libs from core.json 
* includes them at the beginning of initTemplate()
 2014-12-15 14:30:03 +01:00
Morris Jobke d367d1b06a Merge pull request #12839 from oparoz/ControllerMethodReflector 
\OCP\AppFramework\Utility\IControllerMethodReflector
 2014-12-15 14:20:26 +01:00
Morris Jobke eb97bb5617 Merge pull request #12846 from owncloud/fix-searchbytags-test 
Sort results to make sure assert work on consistent order
 2014-12-15 13:23:59 +01:00
Vincent Petry 1d22cd5b22 Use star icon for favorites 2014-12-15 12:44:41 +01:00
Vincent Petry 20c30ac79a Load handlebars in core 2014-12-15 12:43:05 +01:00
Bernhard Posselt be45366013 Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands 
adding dependencies for command line tools and php libraries
 2014-12-15 12:34:46 +01:00
Thomas Müller e58b9d3eb7 fixing owncloud version 2014-12-15 12:23:56 +01:00
Vincent Petry dfe922b72a Correctly replace favorites icon when re-rendering file actions 2014-12-15 12:10:54 +01:00
Vincent Petry a5bb66f4a7 Added favorites feature to the files app 2014-12-15 12:10:54 +01:00
Vincent Petry c6be491a89 Return file info from Node API 2014-12-15 12:10:54 +01:00
Morris Jobke b831914aa6 Merge pull request #11991 from owncloud/bower-jquery-ui 
bower jquery-ui - exported changes to a separate css file
 2014-12-15 11:39:31 +01:00
Vincent Petry 5007289422 Sort results to make sure assert work on consistent order 2014-12-15 11:32:32 +01:00
Jenkins for ownCloud 036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Olivier Paroz 469fd3b3a3 Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflector 2014-12-14 23:54:31 +01:00
Philipp Knechtges 768aea57d3 make regex in controllermethodreflector.php compatible with PCRE 6.x 
The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
 2014-12-14 10:52:21 +01:00
Jenkins for ownCloud 6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke 5b3971f002 Merge pull request #12639 from owncloud/bad_mtime_format 
Fix formatting of bad dates from external storages
 2014-12-13 10:07:10 +01:00
Morris Jobke edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke 29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges 
Move file thumbnail element into the label tag
 2014-12-13 09:00:43 +01:00
Morris Jobke efb495b09f Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index 
Add filter for backend to rest index
 2014-12-13 08:50:15 +01:00
Jenkins for ownCloud 416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Robin McCorkell fdbb68a3c3 Return ? if mtime is 0 or -1 
Tooltip contains 'Unable to determine date'. Fixes #6395
 2014-12-12 23:54:18 +00:00
Lukas Reschke 76a633bf52 Make comment clear 2014-12-12 16:50:14 +01:00
Lukas Reschke dced436a3a Comment code path 2014-12-12 16:45:11 +01:00
Lukas Reschke 202f1215aa Use limit and offset 2014-12-12 16:43:24 +01:00