summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5154 from owncloud/fix-appimagesMorris Jobke2013-10-064-4/+3
|\
| * Optimize images with optipngkondou2013-10-063-0/+0
| * fix mobile and desktop app images looking differentJan-Christoph Borchardt2013-10-054-4/+3
* | Merge pull request #4982 from syncloud/masterOwen Winkler2013-10-052-4/+24
|\ \ | |/ |/|
| * Moving Advanced button out of datadirField fieldsetvsapronov2013-10-041-1/+6
| * Fixed review issuesvsapronov2013-09-292-14/+14
| * autoconfig.php could have only some of parameters; installation.php generates...vsapronov2013-09-252-3/+18
* | Merge pull request #5131 from owncloud/fix-5130VicDeo2013-10-052-2/+2
|\ \
| * | Allow "Finishing..." button on setup page to be translated.ringmaster2013-10-042-2/+2
* | | more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-051-5/+11
* | | Merge pull request #5136 from owncloud/design-fixesMorris Jobke2013-10-048-2/+39
|\ \ \
| * | | add useful icon from News app to coreJan-Christoph Borchardt2013-10-046-0/+32
| * | | prevent hover effect when settings are openJan-Christoph Borchardt2013-10-041-1/+6
| * | | fix disabled buttons not showing iconsJan-Christoph Borchardt2013-10-041-1/+1
| |/ /
* | | remove specific border-radius for .primary button as it should be specific to...Jan-Christoph Borchardt2013-10-041-1/+3
* | | merge master into input-simplifyJan-Christoph Borchardt2013-10-0413-38/+235
|\| |
| * | Fixed array syntax to work with PHP 5.3Vincent Petry2013-10-041-1/+1
| * | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-048-27/+84
| |\ \
| | * \ Merge pull request #5107 from owncloud/user_skeletonThomas Müller2013-10-041-0/+5
| | |\ \
| | | * | add a real examplefile instead of an .gitignore which is a bit stupid hereFrank Karlitschek2013-10-042-4/+5
| | | * | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-031-0/+4
| | * | | Merge pull request #5109 from owncloud/controls-bar-heightMorris Jobke2013-10-045-21/+59
| | |\ \ \
| | | * | | increase height of controls bar and elements to more clickable 44pxJan-Christoph Borchardt2013-10-045-21/+59
| | | |/ /
| | * / / Hide defaultavatar in #header and don't darken proper avatars in #headerkondou2013-10-043-6/+20
| | |/ /
| * | | Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core i...Bjoern Schiessle2013-10-044-72/+81
| |\ \ \
| | * | | Fixed syntax error in arrayVincent Petry2013-10-031-1/+1
| | * | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-024-72/+81
| | |\| |
| * | | | fix array_diff callBjoern Schiessle2013-10-041-1/+1
| |/ / /
| * | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0218-21/+136
| |\ \ \
| * | | | grammar fixesBjoern Schiessle2013-09-302-2/+2
| * | | | fix mail subject; don't show time for expire dateBjoern Schiessle2013-09-301-2/+3
| * | | | go back to old template but add expire date as optional contentBjoern Schiessle2013-09-302-6/+15
| * | | | use template for txt and html mails to send notification mailsBjoern Schiessle2013-09-253-26/+29
| * | | | some small js fixesBjoern Schiessle2013-09-241-4/+5
| * | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-2392-60/+795
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-1623-73/+507
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-0514-61/+122
| |\ \ \ \ \ \
| * | | | | | | coding-style fixesBjoern Schiessle2013-09-032-3/+15
| * | | | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-02161-394/+3569
| |\ \ \ \ \ \ \
| * | | | | | | | add expiration date if it is already setBjoern Schiessle2013-08-301-2/+6
| * | | | | | | | don't send mail to the user who shared the fileBjoern Schiessle2013-08-301-0/+3
| * | | | | | | | set sendMail status back to falseBjoern Schiessle2013-08-302-8/+4
| * | | | | | | | some clean-upBjoern Schiessle2013-08-301-51/+32
| * | | | | | | | return mailSend status in getItems()Bjoern Schiessle2013-08-301-2/+3
| * | | | | | | | enable user to inform recipients about a shared file by mailBjoern Schiessle2013-08-303-10/+139
* | | | | | | | | better style and color for warning and success feedback on inputsJan-Christoph Borchardt2013-10-031-2/+2
* | | | | | | | | simplify input elements for less cognitive load. No box-shadow, no text-shado...Jan-Christoph Borchardt2013-10-032-60/+56
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | just fix whitespace stuffMorris Jobke2013-10-021-64/+66
* | | | | | | | simplify From Link icon in New menuJan-Christoph Borchardt2013-10-022-0/+12
* | | | | | | | remove box-shadows for header, navigation and controls bar - looks sharper an...Jan-Christoph Borchardt2013-10-021-5/+0