Commit graph

3807 commits

Author SHA1 Message Date
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
Robin Appelman
a6a8e2c553 add public api to get the file id from the cache 2012-04-15 11:44:04 +02:00
Robin Appelman
c5b8a3eb94 fix installing shipped apps 2012-04-15 11:05:55 +02:00
Bartek Przybylski
f241615693 fix getAppVersion error 2012-04-15 00:05:28 +02:00
Jan-Christoph Borchardt
ba5e60e2e4 firefighting Robin-breakage 2012-04-14 19:05:01 +02:00
Robin Appelman
4410f15dd8 don't rely on the old version in info.xml anymore 2012-04-14 19:01:59 +02:00
Jan-Christoph Borchardt
fbb314ef4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 18:56:55 +02:00
Jan-Christoph Borchardt
f16cfbab5e improved installation instructions 2012-04-14 18:44:32 +02:00
Jan-Christoph Borchardt
85cb171cb8 improved updater wording 2012-04-14 18:41:09 +02:00
Bart Visscher
3b71e46cf7 Contact: Don't use non core class in appinfo/app.php 2012-04-14 18:34:59 +02:00
Bart Visscher
402c6da968 Typo fix (breif->brief) 2012-04-14 18:31:42 +02:00
Bart Visscher
4976daca7a Fix default database type string 2012-04-14 18:31:41 +02:00
Bart Visscher
30498fd6f8 Use offset function to position block elements 2012-04-14 18:31:41 +02:00
Arthur Schiwon
29bb5d27e4 few pieces of documentation 2012-04-14 18:26:51 +02:00
Robin Appelman
8113a43252 typo 2012-04-14 18:09:42 +02:00
Arthur Schiwon
19243b3e91 give back expected result types as long as logic is not there yet 2012-04-14 18:08:40 +02:00
Arthur Schiwon
e160acefe3 test for ldap group backend 2012-04-14 18:08:40 +02:00
Arthur Schiwon
61a43419a5 starting to create the ldap group backend (with some inspiration from Yoann Gini) and preparing an general LDAP class 2012-04-14 18:08:40 +02:00
Robin Appelman
dec139716e cache app types in the db 2012-04-14 17:53:02 +02:00
Robin Appelman
5608867edc use the correct array indexes... 2012-04-14 17:52:49 +02:00