summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\|
| | * 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
* | | fix array_diff callBjoern Schiessle2013-10-041-1/+1
|/ /
* | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0218-21/+136
|\|
| * 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
| |/ /
* | | 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 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
| | * | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-131-0/+9
| | * | Cleanup and more style fixesBart Visscher2013-09-021-7/+5
| | * | Use more object oriented way for console commandsBart Visscher2013-09-011-0/+30
| * | | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
| |\ \ \
| | * | | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 19:54:56 +0000