summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | 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
* | | | | | | | reduce rounded corners of Share and Versions dropdownJan-Christoph Borchardt2013-10-021-3/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-301-1/+2
|\ \ \ \ \ \ \
| * | | | | | | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-241-1/+1
| * | | | | | | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-241-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-305-3/+47
* | | | | | | followup of #4032 - makes the settings-button bigger and adds again padding a...Alessandro Cosentino2013-09-291-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-292-6/+20
* | | | | | | Base defaultavatar text on displaynamekondou2013-09-282-2/+6
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-273-0/+8
* | | | | | | Merge pull request #4887 from owncloud/sharing_disable_public_uploadBjörn Schießle2013-09-261-2/+2
|\ \ \ \ \ \ \
| * | | | | | | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-171-3/+1
| * | | | | | | check only permission from link-share to decide if public upload is enabled o...Bjoern Schiessle2013-09-171-1/+3
* | | | | | | | Merge pull request #4987 from owncloud/different_color_placeholderMorris Jobke2013-09-251-2/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Shorten optional text-argument processingkondou2013-09-251-3/+2
| * | | | | | | Make it possible to have a different color than the username for placeholderkondou2013-09-251-2/+14
| | |/ / / / / | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-244-4/+36
|/ / / / / /
* | | | | | Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-231-1/+12
|\ \ \ \ \ \
| * | | | | | initialize variableBjoern Schiessle2013-09-201-0/+1
| * | | | | | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-201-1/+11
| |/ / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2265-12/+139
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2083-18/+183
* | | | | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-192-0/+43
|\ \ \ \ \ \
| * | | | | | Add copyright, remove starting blank lineBart Visscher2013-09-191-0/+6