summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core i...Bjoern Schiessle2013-10-0411-90/+112
|\
| * Fixed syntax error in arrayVincent Petry2013-10-031-1/+1
| * Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-0211-90/+112
| |\
| | * Merge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-tabl...Thomas Müller2013-10-021-1/+9
| | |\
| | | * only perform files upgrade in case there are actually entries in the old fsca...Thomas Müller2013-10-021-1/+9
| | * | Merge pull request #5093 from owncloud/file-actionsJan-Christoph Borchardt2013-10-022-8/+13
| | |\ \
| | | * | Takes nametext inside the anchor tag to fix the issue completely.raghunayyar2013-10-021-8/+5
| | | * | Closes Label inside the a tag for not hiding the fileactions.raghunayyar2013-10-022-2/+4
| | | * | File Selected on Click instead of download.raghunayyar2013-10-022-1/+7
| | * | | Merge pull request #5095 from owncloud/design-finetuneRaghu Nayyar2013-10-021-64/+66
| | |\ \ \
| | | * | | just fix whitespace stuffMorris Jobke2013-10-021-64/+66
| | * | | | Merge pull request #5092 from owncloud/design-finetuneFrank Karlitschek2013-10-026-10/+20
| | |\| | | | | | |/ / | | |/| |
| | | * | simplify From Link icon in New menuJan-Christoph Borchardt2013-10-023-1/+13
| | | * | reduce rounded corners of New dropdownJan-Christoph Borchardt2013-10-021-1/+4
| | | * | 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 #5076 from owncloud/fix_filepicker_kondouMorris Jobke2013-10-021-4/+0
| | |\ \ | | | |/ | | |/|
| | | * Remove require in rawlist.phpkondou2013-10-021-4/+0
| | | * Fix require in apps/files/ajax/rawlist.phpkondou2013-10-021-1/+1
| | |/
| | * Merge pull request #5071 from owncloud/fix-autoloader-masterThomas Müller2013-10-022-3/+4
| | |\
| | | * fix unit testsMorris Jobke2013-10-021-3/+3
| | | * Fix autoloader regressionVictor Dubiniuk2013-10-021-0/+1
* | | | fix array_diff callBjoern Schiessle2013-10-041-1/+1
|/ / /
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-02500-2195/+10018
|\| |
| * | Merge pull request #4894 from owncloud/fixing-4620-masterOwen Winkler2013-10-012-2/+6
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into fixing-4620-masterThomas Müller2013-10-011012-10067/+30755
| | |\ | | |/ | |/|
| * | Merge pull request #5039 from owncloud/lib-private-master-2Morris Jobke2013-10-01313-10/+10
| |\ \
| | * \ Merge branch 'master' into lib-private-master-2Thomas Müller2013-10-014-7/+68
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #5026 from owncloud/channelsThomas Müller2013-10-014-7/+68
| |\ \ \
| | * | | add explanationFrank Karlitschek2013-10-011-1/+1
| | * | | use a 4 digit numberFrank Karlitschek2013-10-011-1/+1
| | * | | use public api for session access from server containerThomas Müller2013-09-301-12/+18
| | * | | Merge branch 'master' into channelsThomas Müller2013-09-301376-21637/+74043
| | |\ \ \ | | |/ / / | |/| | |
| | * | | put the current version and edition into a seperate file to simplify packagin...Frank Karlitschek2013-09-302-5/+55
| | * | | use ===Frank Karlitschek2013-09-301-1/+6
| | * | | prepare the updater for the new update channelsFrank Karlitschek2013-09-301-1/+1
| | | * | Merge branch 'master' into lib-private-master-2Thomas Müller2013-09-304-1/+26
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-304-1/+26
| |\ \ \ \
| | * | | | set rememberlogin to false for the encryption appBjoern Schiessle2013-09-261-0/+1
| | * | | | check every enabled app if the remember login feature needs to be disabledBjoern Schiessle2013-09-261-3/+13
| | * | | | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-243-3/+14
| | * | | | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-243-7/+10
| | | | * | reorganize file in libThomas Müller2013-09-303-0/+0
| | | | * | move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-30310-10/+10
| | |_|/ / | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-3058-430/+583
| * | | | Merge pull request #5012 from owncloud/check_keyfiles_existsMorris Jobke2013-09-301-8/+12
| |\ \ \ \
| | * | | | check not only if the keyfile folder exists but also if it contains keyfilesBjoern Schiessle2013-09-271-8/+12
| * | | | | Merge pull request #4459 from owncloud/appframework-masterThomas Müller2013-09-3091-1140/+7913
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-3010-15/+225
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-2924-123/+156
| | |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 17:04:53 +0000