summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2516 from kabum/masterBernhard Posselt2013-03-291-1/+12
|\ | | | | share autocomplete - improve group appearance - issue #173
| * use simple markup to highlight groups in share autocompleteMorris Jobke2013-03-222-10/+4
| |
| * replace hardcoded css style with css class - ref owncloud/core#173Morris Jobke2013-03-212-1/+6
| |
| * share autocomplete - improve group appearanceMorris Jobke2013-03-211-1/+13
| | | | | | | | | | | | highlight groups with markup (bold font) instead of "(group)" postfix ref owncloud/core#173
* | Merge pull request #2584 from mrtorrent/fix_instanceid_formatBernhard Posselt2013-03-292-12/+18
|\ \ | | | | | | Fix instanceid format to prevent session loop
| * | Ensure instanceid contains a letterMiquel Rodríguez Telep / Michael Rodríguez-Torrent2013-03-262-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | instanceid is generated by uniqid() and then used as the session_name. Because session_name requires at least one letter and uniqid() does not guarantee to provide that, in the case that uniqid() generates a string of only digits, the user will be stuck in an infinite login loop because every request will generate a new PHP session.
| * | Minor typo, coding style fixes for OC_Util::getInstanceIdMiquel Rodríguez Telep / Michael Rodríguez-Torrent2013-03-261-12/+12
| | |
* | | Merge pull request #2597 from kabum/lesslogBernhard Posselt2013-03-293-10/+24
|\ \ \ | | | | | | | | Make it possible to show less log entries again
| * | | fix typo and remove animationMorris Jobke2013-03-281-2/+1
| | | |
| * | | convert js call to css ruleMorris Jobke2013-03-282-1/+1
| | | |
| * | | apply code review hintsMorris Jobke2013-03-282-15/+13
| | | |
| * | | add copyright noteMorris Jobke2013-03-271-0/+1
| | | |
| * | | remove animationMorris Jobke2013-03-271-2/+1
| | | |
| * | | Make it possible to show less log entries again - fix owncloud/core#1593Morris Jobke2013-03-272-3/+20
| | | | | | | | | | | | | | | | | | | | * show "less" button only if there are more than 3 entries * only "remove" logs till last 3 entries
* | | | Merge pull request #2448 from owncloud/userlist_available_groupsBernhard Posselt2013-03-291-4/+13
|\ \ \ \ | | | | | | | | | | User list: Keep array of available groups. Should fix #873
| * | | | User list: Keep array of available groups. Should fix #873Thomas Tanghus2013-03-191-4/+13
| | | | |
* | | | | Merge pull request #2585 from mrtorrent/fix_install_app_version_checkBart Visscher2013-03-291-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix install app version check
| * | | | | Use isAppVersionCompatible in app installerMiquel Rodríguez Telep / Michael Rodríguez-Torrent2013-03-271-2/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #2575 from owncloud/fixing-1461-masterJörn Friedrich Dreyer2013-03-281-5/+25
|\ \ \ \ \ | | | | | | | | | | | | Fix upload progressbar in IE8 and IE9
| * | | | | fixes #1463 - file size is now displayed correctly in IE8Thomas Mueller2013-03-261-2/+6
| | | | | |
| * | | | | fixes #1461Thomas Mueller2013-03-261-3/+19
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-2814-18/+21
| | | | |
* | | | | WhitespacesArthur Schiwon2013-03-271-3/+3
| | | | |
* | | | | Share Dialog: show Displayname instead of internal nameArthur Schiwon2013-03-271-1/+1
| | | | |
* | | | | Cache: on equal mtime also for equal size before keeping ETag, at least ↵Arthur Schiwon2013-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | makes Unit Test happy
* | | | | Cache: Do not overwrite ETag when file did not changeArthur Schiwon2013-03-271-4/+6
| | | | |
* | | | | Only prepare an SQL statement once.Arthur Schiwon2013-03-271-1/+4
| | | | |
* | | | | Add PHPDocArthur Schiwon2013-03-271-0/+6
| | | | |
* | | | | Adjust to Icewind's fixArthur Schiwon2013-03-271-51/+0
| | | | |
* | | | | Cache: fix property path for getting legacy etagRobin Appelman2013-03-271-1/+1
| | | | |
* | | | | Port Icewind's fix IRobin Appelman2013-03-272-2/+23
| | | | |
* | | | | Port OC_Property Table IndexArthur Schiwon2013-03-271-2/+7
| | | | |
* | | | | Change LIMIT in DB query respectively remove where not necessaryArthur Schiwon2013-03-271-2/+1
| | | | |
* | | | | Remove Debug outputArthur Schiwon2013-03-271-2/+0
| | | | |
* | | | | Upgrade FileCache on ownCloud upgrade for all users with filesArthur Schiwon2013-03-272-1/+66
| | | | |
* | | | | Performance: prepare queries only onceArthur Schiwon2013-03-271-5/+10
| | | | |
* | | | | Fix lost ETag on Cache UpgradeArthur Schiwon2013-03-271-3/+74
| | | | |
* | | | | Files External: show display names instead of internal user names in Settings UIArthur Schiwon2013-03-272-1/+2
| | | | |
* | | | | Merge pull request #2598 from ceri/masterblizzz2013-03-270-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Use displayName in the From field of outbound email about new shares.
| * | | | | Use displayName in the From field of outbound email about new shares.Ceri Davies2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important in the Active Directory case where users are currently getting a GUID in the From field, making emails look quite a lot like spam.
* | | | | | Users: use DisplayName in the Display Name col when appending usersArthur Schiwon2013-03-271-1/+1
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-27363-5581/+8771
| | | | |
* | | | | Merge pull request #2578 from owncloud/fixing-2577-masterThomas Müller2013-03-262-3/+3
|\ \ \ \ \ | | | | | | | | | | | | prevent to fire delete ajax a second time.
| * | | | | prevent to fire delete ajax a second time.Thomas Mueller2013-03-262-3/+3
| | |/ / / | |/| | | | | | | | | | | | | Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
* | | | | Merge pull request #2567 from owncloud/fix_insertIfNotExistThomas Tanghus2013-03-261-15/+16
|\ \ \ \ \ | |/ / / / |/| | | | Properly prepare insertIfNotExist queries.
| * | | | And removing an irrelevant comment ;)Thomas Tanghus2013-03-261-2/+0
| | | | |
| * | | | Double quotes to backticksThomas Tanghus2013-03-261-4/+4
| | | | |
| * | | | Missing backticks. Thx @Raydiation :)Thomas Tanghus2013-03-261-1/+1
| | | | |
| * | | | D'oh, why concatenate static strings.Thomas Tanghus2013-03-261-1/+1
| | | | |
| * | | | Quote key for SQLite.Thomas Tanghus2013-03-261-1/+1
| | | | |