summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* check if adminFrank Karlitschek2012-12-294-1/+10
* Fall back to default log file if logfile config file not found, suppress writ...Michael Gapczynski2012-12-291-5/+10
* [tx-robot] updated from transifexJenkins for ownCloud2012-12-2912-15/+17
* Change post_write hook to write to prevent creating a duplicate of the origin...Michael Gapczynski2012-12-291-1/+1
* prevent keyboardshortcuts from catching events outside the main doc - e.g. th...Thomas Mueller2012-12-291-0/+3
* Merge branch 'master' into ocs_apiTom Needham2012-12-16124-2770/+3675
|\
| * Merge pull request #923 from owncloud/hooks_try_catchicewind19912012-12-161-1/+5
| |\
| | * wrap hooks into a try, catch to prevent a faulty app from crashing the requestRobin Appelman2012-12-161-1/+5
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-1628-74/+101
| * 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-155-9/+10
| * | More whitespace fixesBart Visscher2012-12-155-116/+117
| * | Fix "There must be a single space between the closing parenthesis and the ope...Bart Visscher2012-12-154-7/+7
| * | 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
* | | API: PUT and DELETE variables are now accessed from the parameters arrayTom Needham2012-12-151-3/+3
* | | Merge master into ocs_api, fix conflicts.Tom Needham2012-12-141030-26105/+46695
|\| |
| * | 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
| |\ \
| | * | 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 filesRobin Appelman2012-12-131-1/+1
| |/ /
| * | Merge pull request #855 from owncloud/ungreenifyblizzz2012-12-132-19/+12
| |\ \
| | * | 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
| |\ \ \
| | * | | Exclude LDAP backend from global user searchesLorenzo M. Catucci2012-12-071-3/+3
| | * | | Add an $excludingBackend optional parameterLorenzo M. Catucci2012-12-072-4/+9
| * | | | [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 reachedThomas Mueller2012-12-121-1/+1
| |/ / /
| * | | set the session name to the instance id - which is uniqueThomas Mueller2012-12-121-0/+3
| * | | Merge pull request #810 from owncloud/send-share-link-by-emailThomas Müller2012-12-124-9/+87
| |\ \ \
| | * | | 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
| |\ \ \ \
| | * | | | Fix the loop to search al the available languages, not only the las element.Sergi Almacellas Abellana2012-12-091-4/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-16 08:18:14 +0000