Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #4982 from syncloud/master | Owen Winkler | 2013-10-05 | 2 | -4/+24 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Moving Advanced button out of datadirField fieldset | vsapronov | 2013-10-04 | 1 | -1/+6 | |
| * | | | Fixed review issues | vsapronov | 2013-09-29 | 2 | -14/+14 | |
| * | | | autoconfig.php could have only some of parameters; installation.php generates... | vsapronov | 2013-09-25 | 2 | -3/+18 | |
* | | | | Merge pull request #5131 from owncloud/fix-5130 | VicDeo | 2013-10-05 | 2 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Allow "Finishing..." button on setup page to be translated. | ringmaster | 2013-10-04 | 2 | -2/+2 | |
* | | | | | more elegant style for Personal and Admin settings | Jan-Christoph Borchardt | 2013-10-05 | 1 | -5/+11 | |
* | | | | | Merge pull request #5136 from owncloud/design-fixes | Morris Jobke | 2013-10-04 | 8 | -2/+39 | |
|\ \ \ \ \ | ||||||
| * | | | | | add useful icon from News app to core | Jan-Christoph Borchardt | 2013-10-04 | 6 | -0/+32 | |
| * | | | | | prevent hover effect when settings are open | Jan-Christoph Borchardt | 2013-10-04 | 1 | -1/+6 | |
| * | | | | | fix disabled buttons not showing icons | Jan-Christoph Borchardt | 2013-10-04 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | remove specific border-radius for .primary button as it should be specific to... | Jan-Christoph Borchardt | 2013-10-04 | 1 | -1/+3 | |
* | | | | | merge master into input-simplify | Jan-Christoph Borchardt | 2013-10-04 | 13 | -38/+235 | |
|\| | | | | ||||||
| * | | | | Fixed array syntax to work with PHP 5.3 | Vincent Petry | 2013-10-04 | 1 | -1/+1 | |
| * | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-04 | 8 | -27/+84 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #5107 from owncloud/user_skeleton | Thomas Müller | 2013-10-04 | 1 | -0/+5 | |
| | |\ \ \ \ | ||||||
| | | * | | | | add a real examplefile instead of an .gitignore which is a bit stupid here | Frank Karlitschek | 2013-10-04 | 2 | -4/+5 | |
| | | * | | | | make it possible to prepopulate a new user gome with a skeleton | Frank Karlitschek | 2013-10-03 | 1 | -0/+4 | |
| | | | |_|/ | | | |/| | | ||||||
| | * | | | | Merge pull request #5109 from owncloud/controls-bar-height | Morris Jobke | 2013-10-04 | 5 | -21/+59 | |
| | |\ \ \ \ | ||||||
| | | * | | | | increase height of controls bar and elements to more clickable 44px | Jan-Christoph Borchardt | 2013-10-04 | 5 | -21/+59 | |
| | | |/ / / | ||||||
| | * / / / | Hide defaultavatar in #header and don't darken proper avatars in #header | kondou | 2013-10-04 | 3 | -6/+20 | |
| | |/ / / | ||||||
| * | | | | Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core i... | Bjoern Schiessle | 2013-10-04 | 4 | -72/+81 | |
| |\ \ \ \ | ||||||
| | * | | | | Fixed syntax error in array | Vincent Petry | 2013-10-03 | 1 | -1/+1 | |
| | * | | | | Merge branch 'master' into sharing_mail_notification_master | Thomas Müller | 2013-10-02 | 4 | -72/+81 | |
| | |\| | | | ||||||
| * | | | | | fix array_diff call | Bjoern Schiessle | 2013-10-04 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 18 | -21/+136 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | grammar fixes | Bjoern Schiessle | 2013-09-30 | 2 | -2/+2 | |
| * | | | | fix mail subject; don't show time for expire date | Bjoern Schiessle | 2013-09-30 | 1 | -2/+3 | |
| * | | | | go back to old template but add expire date as optional content | Bjoern Schiessle | 2013-09-30 | 2 | -6/+15 | |
| * | | | | use template for txt and html mails to send notification mails | Bjoern Schiessle | 2013-09-25 | 3 | -26/+29 | |
| * | | | | some small js fixes | Bjoern Schiessle | 2013-09-24 | 1 | -4/+5 | |
| * | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 92 | -60/+795 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 23 | -73/+507 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-05 | 14 | -61/+122 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | coding-style fixes | Bjoern Schiessle | 2013-09-03 | 2 | -3/+15 | |
| * | | | | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-02 | 161 | -394/+3569 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | add expiration date if it is already set | Bjoern Schiessle | 2013-08-30 | 1 | -2/+6 | |
| * | | | | | | | | don't send mail to the user who shared the file | Bjoern Schiessle | 2013-08-30 | 1 | -0/+3 | |
| * | | | | | | | | set sendMail status back to false | Bjoern Schiessle | 2013-08-30 | 2 | -8/+4 | |
| * | | | | | | | | some clean-up | Bjoern Schiessle | 2013-08-30 | 1 | -51/+32 | |
| * | | | | | | | | return mailSend status in getItems() | Bjoern Schiessle | 2013-08-30 | 1 | -2/+3 | |
| * | | | | | | | | enable user to inform recipients about a shared file by mail | Bjoern Schiessle | 2013-08-30 | 3 | -10/+139 | |
* | | | | | | | | | better style and color for warning and success feedback on inputs | Jan-Christoph Borchardt | 2013-10-03 | 1 | -2/+2 | |
* | | | | | | | | | simplify input elements for less cognitive load. No box-shadow, no text-shado... | Jan-Christoph Borchardt | 2013-10-03 | 2 | -60/+56 | |
| |_|_|_|_|_|/ / |/| | | | | | | | ||||||
* | | | | | | | | just fix whitespace stuff | Morris Jobke | 2013-10-02 | 1 | -64/+66 | |
* | | | | | | | | simplify From Link icon in New menu | Jan-Christoph Borchardt | 2013-10-02 | 2 | -0/+12 | |
* | | | | | | | | remove box-shadows for header, navigation and controls bar - looks sharper an... | Jan-Christoph Borchardt | 2013-10-02 | 1 | -5/+0 | |
* | | | | | | | | reduce rounded corners of Share and Versions dropdown | Jan-Christoph Borchardt | 2013-10-02 | 1 | -3/+3 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled | Thomas Müller | 2013-09-30 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | introduce OC_Util::rememberLoginAllowed() | Bjoern Schiessle | 2013-09-24 | 1 | -1/+1 |