Commit graph

3409 commits

Author SHA1 Message Date
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
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
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
Jan-Christoph Borchardt
a0a5668d1e increase opacity of search field and logout icon 2012-04-14 17:20:50 +02:00
Robin Appelman
b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman
721311c909 some minor optimizations 2012-04-14 16:29:11 +02:00
Robin Appelman
926b2b78fe keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00
Robin Appelman
bfdbdd9b20 remove outdated file 2012-04-14 16:29:11 +02:00
Tom Needham
44c34115a4 Remove go to line 2012-04-14 12:49:31 +00:00
Tom Needham
c069aa62a4 Fix annoying error in log 2012-04-14 12:31:48 +00:00
Tom Needham
9b1c881ca8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 11:18:25 +00:00
Robin Appelman
386663ddb6 swap enable and dissable error messages 2012-04-14 13:16:37 +02:00
Robin Appelman
d8864d4f4b show error when installing an app has failed 2012-04-14 12:57:10 +02:00
Robin Appelman
d3bf013761 prevent users with the same name but different casing from being created 2012-04-14 12:57:10 +02:00
Bart Visscher
5c55b9c5ac Sharing: Add a filename after public share link
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
Bart Visscher
524bd2e75f Sharing: Don't get share icon for undefined filename 2012-04-14 12:45:32 +02:00
Bart Visscher
7504ceb6f2 Sharing: Define missing template vars 2012-04-14 12:45:32 +02:00
Robin Appelman
137dce87fc remove outdated code 2012-04-14 11:42:11 +02:00
Robin Appelman
3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Arthur Schiwon
8ed4606685 LDAP: don't keep possibly outdated passwords 2012-04-14 11:08:50 +02:00
Robin Appelman
d8e54acbf3 test cases for user backends 2012-04-14 10:43:28 +02:00
Arthur Schiwon
9ef34cd831 typo 2012-04-13 23:02:42 +02:00
Arthur Schiwon
74f0bebfc8 don't fail on missing extension 2012-04-13 23:02:42 +02:00
Arthur Schiwon
b9bdad5165 make sure temporary files are being removed, fixes oc-450 2012-04-13 23:02:42 +02:00
Tom Needham
0aaaefbb4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-13 20:10:35 +00:00
Tom Needham
1165b358b4 Update language string 2012-04-13 20:09:04 +00:00
Bart Visscher
b9f9228a22 Contacts: Save the category list update when updating/adding contact 2012-04-13 21:13:58 +02:00
Bart Visscher
4c52007996 Calendar: Update category list when updating/adding event 2012-04-13 21:13:58 +02:00