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

12791 Commits

Author SHA1 Message Date
Thomas Müller b91c6827b7 Merge pull request #4176 from owncloud/fixing-broken-master 
fix php syntax
 2013-07-24 02:27:41 -07:00
Thomas Müller 9d91ceade4 fix php syntax 2013-07-24 10:49:33 +02:00
Jan-Christoph Borchardt 6a5e2ea7d5 check remember log in by default, ref #3918 2013-07-24 10:01:56 +02:00
Morris Jobke 2622839fcf Merge pull request #4171 from owncloud/fix-config 
Fix config
 2013-07-24 00:48:43 -07:00
Jan-Christoph Borchardt 54263624ea Merge pull request #4030 from owncloud/more-themable-strings 
More themable strings
 2013-07-24 00:36:40 -07:00
Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Jenkins for ownCloud 7bb6aab8ee [tx-robot] updated from transifex 2013-07-24 01:57:21 -04:00
Thomas Müller 60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller c517c845f6 Merge branch 'master' into storage-test-cleanup 
Conflicts:
	tests/lib/files/storage/storage.php
 2013-07-24 01:01:36 +02:00
Thomas Müller 5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions 
Cleanup some template functions
 2013-07-23 15:53:43 -07:00
Robin Appelman fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Jan-Christoph Borchardt 315613a8f3 Bring the Noise 2013-07-23 21:33:15 +02:00
Jan-Christoph Borchardt c92e0eab97 remove superfluous important 2013-07-23 21:25:07 +02:00
Bart Visscher 7ad38535e5 Merge pull request #3392 from owncloud/googledrive 
Switch to using Google Drive SDK, closes #2047
 2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt 84fa84d182 fix browser rendering issues 2013-07-23 18:42:35 +02:00
Jan-Christoph Borchardt d1a5dfc397 larger log in and installation buttons 2013-07-23 18:41:02 +02:00
Jan-Christoph Borchardt 12990543bc better whitespace for footer 2013-07-23 18:41:02 +02:00
Jan-Christoph Borchardt 837b158914 cleaner look and code for primary button 2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt 6dfbe21446 input fields work on any background now 2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt c524c04808 add some padding to footer 2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt dc82e29949 adjust labels and input field groups 2013-07-23 18:41:00 +02:00
Jan-Christoph Borchardt 93b227d803 shorten wording on config directory errors 2013-07-23 18:41:00 +02:00
Jan-Christoph Borchardt 31bf24a116 more beautiful warnings 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt 74edfd79f5 fix and checkstyle for show password toggle 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt acb26c3a52 increase button size, adjust remember checkbox 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt 9568fefb80 move log in button CSS to appropriate place 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt 89d0d7f58b adjust text colors for remember and footer 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt 622c567c1f larger clickable area for remember log in 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt 38bfae57fe sticky footer 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt fd4638c229 primary button adjustments 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt 14edfa52ea input field adjustments for new full-color background on log in 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt c478234f6a fix general reset CSS issue which caused gradient background to cut off 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt 107ace42b8 rip out unneeded #login div, replace with existing body-login 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt 9982f47ab5 initial WIP for cleaner log in page 2013-07-23 18:36:44 +02:00
Jörn Friedrich Dreyer 7242480049 use $defaults->getName() as webdav REALM 2013-07-23 18:14:05 +02:00
Bart Visscher 485e8ab0a5 ignore config read failures 2013-07-23 17:38:37 +02:00
Bart Visscher 5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData" 
This reverts commit 8f93490ac4.
 2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer f7422ad132 Merge pull request #4150 from owncloud/better-error-handling 
Better error handling
 2013-07-23 08:30:02 -07:00
Jörn Friedrich Dreyer ab77af7b4d Merge pull request #4159 from owncloud/Fixing-share-sj-error 
Fixing share JS error
 2013-07-23 08:23:15 -07:00
Michael Gapczynski c904504365 Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing 2013-07-23 10:50:14 -04:00
Victor Dubiniuk ab997bdc68 Create an array entry before filling it 2013-07-23 14:57:58 +03:00
Jenkins for ownCloud a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Thomas Müller 6ddad8dc49 Merge pull request #4126 from owncloud/parallel-autotest.sh-master 
Parallel autotest.sh master
 2013-07-22 14:48:49 -07:00
Bart Visscher 179b42c56d Fixed review issues 2013-07-22 23:04:14 +02:00
Victor Dubiniuk 5160ea6063 Show generic error when there is no error 2013-07-22 21:02:18 +03:00
Andreas Fischer 7abf35b085 Merge pull request #4156 from owncloud/fix_oc_image_reference 
* owncloud/fix_oc_image_reference:
  need to use \OC_Image to escape OCP namespace
 2013-07-22 19:19:01 +02:00
Robin Appelman 499a01f179 use === 2013-07-22 17:41:33 +02:00
Jörn Friedrich Dreyer cb4cf3e2f7 need to use \OC_Image to escape OCP namespace 2013-07-22 17:25:55 +02:00
Kondou bc86ce00cf Merge pull request #4154 from owncloud/return-ocl10n 
return result from getL10N
 2013-07-22 08:05:32 -07:00
Robin Appelman b073a34e77 add support for the <primary/> element within field definitions 2013-07-22 16:25:07 +02:00