summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-15302-6579/+15385
|\
| * Merge pull request #875 from owncloud/multiplefiles_jsonBart Visscher2012-12-142-2/+2
| |\ | | | | | | use json when deleting multiply files instead of using ; as delimiter
| | * 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-155-9/+10
| | |
| * | More whitespace fixesBart Visscher2012-12-155-116/+117
| | |
| * | Fix "There must be a single space between the closing parenthesis and the ↵Bart Visscher2012-12-154-7/+7
| | | | | | | | | | | | opening brace"
| * | Fix some of "Closing brace must be on a line by itself"Bart Visscher2012-12-153-6/+22
| | |
| * | Fix "Line indented incorrectly"Bart Visscher2012-12-1511-62/+62
| | |
| * | Fix "No space found after comma in function call"Bart Visscher2012-12-155-6/+6
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-1584-2526/+3382
| | |
| * | 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
| | |
| * | Merge pull request #850 from owncloud/icons-for-loginFrank Karlitschek2012-12-147-7/+3868
| |\ \ | | | | | | | | Icons for login
| | * | tweak icons for username and password fields, now it’s goodJan-Christoph Borchardt2012-12-125-38/+20
| | | |
| | * | icons for username and password field, not sure if it’s goodJan-Christoph Borchardt2012-12-117-7/+3886
| | | |
| * | | implement getCurrentUser in Sabre Auth Connector, fixes #508Arthur Schiwon2012-12-141-0/+15
| | | |
| * | | use username, not passed loginname, might differArthur Schiwon2012-12-141-1/+1
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-1438-189/+256
| | | |
| * | | Merge pull request #876 from owncloud/mimicon_fixicewind19912012-12-131-1/+1
| |\ \ \ | | |_|/ | |/| | fix mimetype icons for new files
| | * | fix mimetype icons for new filesRobin Appelman2012-12-131-1/+1
| |/ /
| * | Merge pull request #855 from owncloud/ungreenifyblizzz2012-12-132-19/+12
| |\ \ | | | | | | | | ungreenify new & upload buttons
| | * | small code reordering of inputs and buttonsJan-Christoph Borchardt2012-12-131-5/+6
| | | |
| | * | improve general button coloringJan-Christoph Borchardt2012-12-131-2/+4
| | | |
| | * | ungreenify new & upload buttonsJan-Christoph Borchardt2012-12-131-12/+2
| | | |
| * | | Merge pull request #584 from wardragon/ldap_access_userExists_fixblizzz2012-12-123-7/+12
| |\ \ \ | | | | | | | | | | Really fix OCP\Share::shareItem with LDAP users
| | * | | Exclude LDAP backend from global user searchesLorenzo M. Catucci2012-12-071-3/+3
| | | | | | | | | | | | | | | | | | | | triggered by itself.
| | * | | Add an $excludingBackend optional parameterLorenzo M. Catucci2012-12-072-4/+9
| | | | | | | | | | | | | | | | | | | | to the userExists method both in OCP\User and in OC_User.
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-13157-2578/+5195
| | | | |
| * | | | Merge pull request #847 from owncloud/webdav-quota-fix-exceptionThomas Müller2012-12-121-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | throwing InsufficientStorage in case the quota is reached
| | * | | throwing InsufficientStorage in case the quota is reachedThomas Mueller2012-12-121-1/+1
| |/ / /
| * | | set the session name to the instance id - which is uniqueThomas Mueller2012-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php
| * | | Merge pull request #810 from owncloud/send-share-link-by-emailThomas Müller2012-12-124-9/+87
| |\ \ \ | | | | | | | | | | restoring feature to send sharing link via email
| | * | | feedback to the user while request is being processedThomas Mueller2012-12-121-2/+9
| | | | |
| | * | | moving sharing email code to coreThomas Mueller2012-12-104-64/+60
| | | | |
| | * | | restoring feature to send sharing link via emailThomas Mueller2012-12-104-7/+82
| | | | |
| * | | | Merge pull request #766 from btactic/language_autodetectThomas Müller2012-12-121-2/+8
| |\ \ \ \ | | | | | | | | | | | | Improve autodetection of language.
| | * | | | Fix the loop to search al the available languages, not only the las element.Sergi Almacellas Abellana2012-12-091-4/+4
| | | | | |
| | * | | | Improve autodetection of language.Sergi Almacellas Abellana2012-12-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #730.
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-1279-1235/+2120
| | | | | |
| * | | | | Merge pull request #829 from owncloud/contacts_api_namespace_fixBart Visscher2012-12-112-6/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide...
| | * | | | | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide ↵Thomas Mueller2012-12-112-6/+8
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | access to their contact data
| * | | | | Merge pull request #825 from owncloud/oc_namespaceThomas Müller2012-12-111-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | Autoload classes with 'OC' namespace prefix.
| | * | | | | Autoload classes with 'OC' namespace prefix.Thomas Tanghus2012-12-111-0/+3
| | | | | | |
| * | | | | | Merge pull request #813 from owncloud/check_external_dependenciesThomas Müller2012-12-114-59/+104
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Check external dependencies
| | * | | | | 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 ↵Frank Karlitschek2012-12-101-59/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bit and improve naming
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 07:47:21 +0000