wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14091 commits 157 branches 562 tags 714 MiB
Commit graph

2138 commits

Author SHA1 Message Date
Morris Jobke
1537410a31 Merge pull request #5154 from owncloud/fix-appimages 
fix mobile and desktop app images looking different
 2013-10-06 12:31:54 -07:00
kondou
bf83b1eb90 Optimize images with optipng 2013-10-06 21:20:49 +02:00
Owen Winkler
08e1147a6b Merge pull request #4982 from syncloud/master 
Automatic config can set some of parameters or all of them
 2013-10-05 16:13:46 -07:00
Jan-Christoph Borchardt
11a69fbddf fix mobile and desktop app images looking different 2013-10-05 15:40:00 +03:00
VicDeo
485bb100b3 Merge pull request #5131 from owncloud/fix-5130 
Allow "Finishing..." button on setup page to be translated.
 2013-10-05 02:32:28 -07:00
Jan-Christoph Borchardt
2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
vsapronov
46ca1eb91b Moving Advanced button out of datadirField fieldset 2013-10-04 20:46:00 -04:00
Morris Jobke
cc1e69c190 Merge pull request #5136 from owncloud/design-fixes 
Design fixes
 2013-10-04 14:56:09 -07:00
Jan-Christoph Borchardt
1cae6661df add useful icon from News app to core 2013-10-04 20:27:01 +03:00
Jan-Christoph Borchardt
2166d99b53 prevent hover effect when settings are open 2013-10-04 20:24:07 +03:00
Jan-Christoph Borchardt
0b78db4750 fix disabled buttons not showing icons 2013-10-04 20:21:36 +03:00
ringmaster
85f63d4f77 Allow "Finishing..." button on setup page to be translated. 
Fixes #5130.
 2013-10-04 11:09:59 -04:00
Jan-Christoph Borchardt
0c53269b5e remove specific border-radius for .primary button as it should be specific to log in instead 2013-10-04 17:37:20 +03:00
Jan-Christoph Borchardt
041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03:00
Vincent Petry
e257c3f27c Fixed array syntax to work with PHP 5.3 
It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.
 2013-10-04 14:28:11 +02:00
Bjoern Schiessle
51295e9a6b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
 2013-10-04 12:30:49 +02:00
Bjoern Schiessle
a223cf769a Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master 
Conflicts:
	core/ajax/share.php
 2013-10-04 12:27:18 +02:00
Bjoern Schiessle
304803d102 fix array_diff call 2013-10-04 12:23:40 +02:00
Thomas Müller
514d7a884a Merge pull request #5107 from owncloud/user_skeleton 
make it possible to prepopulate a new user home with a skeleton
 2013-10-04 02:57:17 -07:00
Frank Karlitschek
566d826a9e add a real examplefile instead of an .gitignore which is a bit stupid here 2013-10-04 10:21:33 +02:00
Morris Jobke
ecd2bf2a55 Merge pull request #5109 from owncloud/controls-bar-height 
Controls bar height
 2013-10-04 01:01:54 -07:00
Jan-Christoph Borchardt
c335169f6d increase height of controls bar and elements to more clickable 44px 2013-10-04 08:41:16 +03:00
kondou
b0ff10a536 Hide defaultavatar in #header and don't darken proper avatars in #header 2013-10-04 02:27:53 +02:00
Frank Karlitschek
e40afbebc6 make it possible to prepopulate a new user gome with a skeleton 2013-10-03 23:22:11 +02:00
Jan-Christoph Borchardt
3c13afee98 better style and color for warning and success feedback on inputs 2013-10-03 16:58:48 +03:00
Jan-Christoph Borchardt
308d4383a3 simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius 2013-10-03 16:35:42 +03:00
Vincent Petry
d09b1553d0 Fixed syntax error in array 2013-10-03 11:31:21 +02:00
Thomas Müller
9c23c3449b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	core/css/share.css
 2013-10-02 23:33:50 +02:00
Morris Jobke
99fa4898fd just fix whitespace stuff 2013-10-02 18:27:55 +02:00
Jan-Christoph Borchardt
5feaa55779 simplify From Link icon in New menu 2013-10-02 18:27:39 +03:00
Jan-Christoph Borchardt
c548edd90f remove box-shadows for header, navigation and controls bar - looks sharper and less washed out 2013-10-02 17:59:38 +03:00
Jan-Christoph Borchardt
8ce26297b9 reduce rounded corners of Share and Versions dropdown 2013-10-02 17:53:54 +03:00
Bjoern Schiessle
8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
Thomas Müller
b58a464b86 Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled 
don't remember login if the encrypion app is enabled
 2013-09-30 10:53:41 -07:00
Jenkins for ownCloud
a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Bjoern Schiessle
084f76fd14 grammar fixes 2013-09-30 13:33:49 +02:00
Bjoern Schiessle
17aa49a890 fix mail subject; don't show time for expire date 2013-09-30 13:33:02 +02:00
Bjoern Schiessle
b9a1f63344 go back to old template but add expire date as optional content 2013-09-30 10:02:26 +02:00
vsapronov
1efbf7774f Fixed review issues 2013-09-29 20:16:32 -04:00
Alessandro Cosentino
710d3f139f followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation 2013-09-29 01:46:23 -04:00
Jenkins for ownCloud
59e4ff7d24 [tx-robot] updated from transifex 2013-09-29 00:03:26 -04:00
kondou
4907685405 Base defaultavatar text on displayname 
Fix #4876
 2013-09-28 16:46:53 +02:00
Jenkins for ownCloud
f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Björn Schießle
6b1d70f148 Merge pull request #4887 from owncloud/sharing_disable_public_upload 
check only permission from link-share to decide if public upload is enabled or disabled
 2013-09-26 03:16:15 -07:00
Morris Jobke
70dccd28ef Merge pull request #4987 from owncloud/different_color_placeholder 
Make it possible to have a different color than the username for placeholder
 2013-09-25 10:11:52 -07:00
kondou
5e7a7b3f61 Shorten optional text-argument processing 2013-09-25 17:19:38 +02:00
kondou
24eb41548e Make it possible to have a different color than the username for placeholder 2013-09-25 12:57:41 +02:00
Bjoern Schiessle
883d1c0df3 use template for txt and html mails to send notification mails 2013-09-25 11:51:28 +02:00
vsapronov
dc382bc9cc autoconfig.php could have only some of parameters; installation.php generates UI accordingly 2013-09-25 00:13:38 -04:00
Jenkins for ownCloud
2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00