summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-1550-106/+263
|\
| * Merge pull request #875 from owncloud/multiplefiles_jsonBart Visscher2012-12-142-2/+2
| |\
| | * remove unneeded lineRobin Appelman2012-12-131-1/+0
| | * use json encoding when deleting multiply files instead of using ; as delimiterRobin Appelman2012-12-132-1/+2
| * | More style fixesBart Visscher2012-12-151-1/+1
| * | More whitespace fixesBart Visscher2012-12-151-9/+9
| * | Fix "There must be a single space between the closing parenthesis and the ope...Bart Visscher2012-12-151-1/+1
| * | Fix some of "Closing brace must be on a line by itself"Bart Visscher2012-12-151-1/+3
| * | Fix "Line indented incorrectly"Bart Visscher2012-12-154-10/+10
| * | Fix "No space found after comma in function call"Bart Visscher2012-12-153-3/+3
| * | Give also hint about possible conflicts in the user_webdavauth descriptionArthur Schiwon2012-12-141-1/+3
| * | Also show a more prominent warning when php_ldap is not installedArthur Schiwon2012-12-141-0/+3
| * | Show conflict warning when user_ldap and user_webdavauth are enabledArthur Schiwon2012-12-141-0/+4
| * | Show conflict warning when user_ldap and user_webdavauth are enabledArthur Schiwon2012-12-143-1/+11
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-145-0/+8
| * | fix mimetype icons for new filesRobin Appelman2012-12-131-1/+1
| |/
| * Merge pull request #855 from owncloud/ungreenifyblizzz2012-12-131-12/+2
| |\
| | * ungreenify new & upload buttonsJan-Christoph Borchardt2012-12-131-12/+2
| * | Merge pull request #584 from wardragon/ldap_access_userExists_fixblizzz2012-12-121-3/+3
| |\ \
| | * | Exclude LDAP backend from global user searchesLorenzo M. Catucci2012-12-071-3/+3
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-1323-0/+93
| | |/ | |/|
| * | Merge pull request #810 from owncloud/send-share-link-by-emailThomas Müller2012-12-121-3/+1
| |\ \
| | * | moving sharing email code to coreThomas Mueller2012-12-102-64/+1
| | * | restoring feature to send sharing link via emailThomas Mueller2012-12-102-1/+62
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-122-0/+2
| * | | Merge pull request #813 from owncloud/check_external_dependenciesThomas Müller2012-12-114-59/+104
| |\ \ \
| | * | | ctor of OC_L10N requires the app nameThomas Mueller2012-12-111-1/+1
| | * | | don't call shell_exec if safe_mode is on.Frank Karlitschek2012-12-111-2/+6
| | * | | disable not available external filesystems. Restructure the configuration a b...Frank Karlitschek2012-12-101-59/+66
| | * | | add some output why some of the external filesystems might not workFrank Karlitschek2012-12-104-1/+35
* | | | | Merge branch 'master' into filesystemRobin Appelman2012-12-1115-143/+332
|\| | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-111-0/+2
| |/ / /
| * / / [tx-robot] updated from transifexJenkins for ownCloud2012-12-106-76/+76
| |/ /
| * | Merge pull request #282 from butonic/fix_new_and_upload_button_html_cssThomas Müller2012-12-094-63/+75
| |\ \
| | * | cleanup CSS whitespace and remove extra input[type='checkbok']Jörn Friedrich Dreyer2012-12-071-12/+13
| | * | fix svg -> png replacement for android, cleanup and remove obsolete cssJörn Friedrich Dreyer2012-12-073-39/+38
| | * | fix new li icons jumping when replacing p with inputJörn Friedrich Dreyer2012-12-071-2/+4
| | * | add IE9 CSS checkbox fixesJörn Friedrich Dreyer2012-12-073-14/+19
| | * | upload button HTML, CSS & JS cleanupJörn Friedrich Dreyer2012-12-074-27/+19
| | * | rmeove vendor prefix for box-shadowJörn Friedrich Dreyer2012-12-071-2/+0
| | * | fix_new_and_upload_button_html_cssJörn Friedrich Dreyer2012-12-072-12/+27
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-093-0/+8
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-081-11/+11
| |/ /
| * | Merge pull request #640 from esthepiking/masterThomas Müller2012-12-063-0/+167
| |\ \
| | * | Code clean upErik Sargent2012-12-051-203/+147
| | * | Remove renameErik Sargent2012-12-041-4/+4
| | * | event.ctrlKeyErik Sargent2012-11-301-1/+2
| | * | event.ctrlKeyErik Sargent2012-11-301-3/+7
| | * | ctrl issue fixErik Sargent2012-11-301-1/+1
| | * | CleanupErik Sargent2012-11-291-26/+51
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 10:54:49 +0000