Robin Appelman
|
b61f6438ba
|
return user specific paths from oc_filecache::getpath
|
2012-04-16 10:06:52 +02:00 |
Simon Birnbach
|
965a8ba2c6
|
Fixed cancelling of uploads and wrong merge conflict resolution
|
2012-04-15 23:52:36 +02:00 |
Georg Ehrke
|
77cefdedb8
|
Merge branch 'master' into sabredav_1.6
|
2012-04-15 22:28:11 +02:00 |
Georg Ehrke
|
dc18e65b46
|
fix merge conflicts
|
2012-04-15 22:26:55 +02:00 |
Jan-Christoph Borchardt
|
1281809300
|
improving file actions also for multiselect
|
2012-04-15 17:49:54 +02:00 |
Jan-Christoph Borchardt
|
e5cda3abcd
|
tooltip for delete shows up to the left
|
2012-04-15 17:49:54 +02:00 |
Jan-Christoph Borchardt
|
2dfab65a33
|
fixing file action positioning
|
2012-04-15 17:49:54 +02:00 |
Robin Appelman
|
8ecddb5bc3
|
create a new filename when the uploaded file already exist
|
2012-04-15 17:34:53 +02:00 |
Bart Visscher
|
74ba09f95c
|
Fix password is being saved even if not changed
Fixes: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-303
|
2012-04-15 17:11:03 +02:00 |
Bart Visscher
|
68b1ae1a36
|
OC_Group_Backend.php misses function groupexists
Fix http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-182
|
2012-04-15 17:11:03 +02:00 |
Bart Visscher
|
ea99e1184d
|
Add well-known redirects to htaccess
Fixes:
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-232
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-445
|
2012-04-15 17:11:03 +02:00 |
Tom Needham
|
b0e68d039c
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-04-15 15:09:54 +00:00 |
Tom Needham
|
712e25bb02
|
Update ace
|
2012-04-15 15:09:37 +00:00 |
Thomas Müller
|
a0d917fe98
|
fixing oc-375 - a number is appended tp the filename
|
2012-04-15 17:00:49 +02:00 |
Jakob Sack
|
0b426b5e64
|
Display correct URL in caldav and carddav paths
|
2012-04-15 16:50:45 +02:00 |
Jakob Sack
|
9b1d6246a9
|
Remove useless, unmaintained dav.php
|
2012-04-15 16:50:44 +02:00 |
Simon Birnbach
|
8e27b725ba
|
Fixed cancelling upload of same file to folder and subfolder
|
2012-04-15 16:47:53 +02:00 |
Robin Appelman
|
9ac65c51f5
|
dont try to view psd files
|
2012-04-15 16:26:08 +02:00 |
Robin Appelman
|
c0bdad5893
|
dont allow draging files to the current directory
|
2012-04-15 16:06:55 +02:00 |
Robin Appelman
|
dae34edf4f
|
fix filecache rename hook
|
2012-04-15 16:06:55 +02:00 |
Tom Needham
|
fef3434bdf
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-04-15 14:02:13 +00:00 |
Tom Needham
|
738601f4fe
|
Remove google web font
|
2012-04-15 14:01:59 +00:00 |
Thomas Müller
|
679ddc0e32
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-04-15 16:01:06 +02:00 |
Simon Birnbach
|
a384fcb99f
|
Merge git://gitorious.org/owncloud/owncloud
Conflicts:
files/css/files.css
files/js/files.js
|
2012-04-15 15:59:57 +02:00 |
Thomas Müller
|
f36d31f74d
|
pdfjs updated from github
|
2012-04-15 15:59:31 +02:00 |
Arthur Schiwon
|
80f4c4f923
|
Bookmarks: handle input with & and ?, fixes oc-201
|
2012-04-15 15:53:40 +02:00 |
Robin Appelman
|
75a4e46872
|
do no offer 'undo delete' on opera
opera lacks the onunload to make it work
|
2012-04-15 15:48:19 +02:00 |
Tom Needham
|
9ee3eb1412
|
remove unused css
|
2012-04-15 13:44:43 +00:00 |
Tom Needham
|
cdf9f8c42a
|
Force Files app to top of app menu
|
2012-04-15 13:41:22 +00:00 |
Robin Appelman
|
b3bd4bc384
|
sanity check on language selection
|
2012-04-15 15:35:20 +02:00 |
Robin Appelman
|
b3ae2208b1
|
clean the collection view after rescanning
|
2012-04-15 15:19:30 +02:00 |
Robin Appelman
|
cf3bb08dfb
|
enable archive support on default
|
2012-04-15 15:19:30 +02:00 |
Robin Appelman
|
9ee931e790
|
only run archive tests if the test data is available
|
2012-04-15 15:19:30 +02:00 |
Robin Appelman
|
71cdfdcec8
|
only run tests of enabled apps
|
2012-04-15 15:19:30 +02:00 |
Arthur Schiwon
|
819af69972
|
group LDAP: simple basic tests
|
2012-04-15 14:50:03 +02:00 |
Arthur Schiwon
|
0a46c7a393
|
group LDAP: usersInGroup not getUsersInGroup
offer static readonly properties
|
2012-04-15 14:50:03 +02:00 |
Arthur Schiwon
|
2a03db6065
|
don't forget changes in lib_ldap for last commit
|
2012-04-15 14:50:03 +02:00 |
Arthur Schiwon
|
8a6fa65ed6
|
group LDAP: implemented getUsersInGroup()
|
2012-04-15 14:50:03 +02:00 |
Arthur Schiwon
|
b480071946
|
group LDAP: implemented getUserGroups()
|
2012-04-15 14:50:03 +02:00 |
Arthur Schiwon
|
0912f40ebe
|
typo
|
2012-04-15 14:50:03 +02:00 |
Arthur Schiwon
|
54a9fd2e6a
|
group LDAP: implemented inGroup()
|
2012-04-15 14:50:03 +02:00 |
Jan-Christoph Borchardt
|
1f91224f9e
|
fixing opacity and fading, also for IE
|
2012-04-15 14:37:42 +02:00 |
Georg Ehrke
|
8ddea7e95c
|
Merge branch 'master' into calendar_sharing
|
2012-04-15 14:28:31 +02:00 |
Jan-Christoph Borchardt
|
897261daf4
|
display file actions perfectly
|
2012-04-15 14:15:11 +02:00 |
Jan-Christoph Borchardt
|
38cb716a57
|
increasing the file row height a bit
|
2012-04-15 13:34:31 +02:00 |
Jan-Christoph Borchardt
|
7ddd043427
|
renamed extention to extension, also now only showing lowercase
|
2012-04-15 13:34:30 +02:00 |
Jan-Christoph Borchardt
|
d32799e4bf
|
show text for file actions
|
2012-04-15 13:34:30 +02:00 |
Jan-Christoph Borchardt
|
5868199e85
|
fixed settings hover, now whole row sensitive and fading not jerky
|
2012-04-15 13:34:30 +02:00 |
Robin Appelman
|
b669c846b0
|
add span around fileactions
|
2012-04-15 13:25:31 +02:00 |
Georg Ehrke
|
e292b1fcdb
|
fix merge conflicts
|
2012-04-15 12:43:07 +02:00 |