Georg Ehrke
|
711aa229b8
|
Merge branch 'master' into movable_apps
|
2012-04-20 22:41:39 +02:00 |
|
Georg Ehrke
|
c3d78cf77a
|
remove require once lib base in files scan.php
|
2012-04-20 22:34:13 +02:00 |
|
Georg Ehrke
|
3aeea0c196
|
Merge branch 'merge-requests/105'
|
2012-04-19 20:31:24 +02:00 |
|
Georg Ehrke
|
3706bbec1b
|
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
|
2012-04-19 20:30:58 +02:00 |
Robin Appelman
|
5cefd34660
|
emulate touch with custom mtime for swift backend
|
2012-04-19 00:25:47 +02:00 |
|
Robin Appelman
|
9a707e10bf
|
add SWIFT (openstack object storage) storage backend
|
2012-04-18 20:54:28 +02:00 |
|
Robin Appelman
|
d1ad4dc8d6
|
add test cases for cryptstream
|
2012-04-18 20:54:28 +02:00 |
|
Robin Appelman
|
b39c3d4c4e
|
make use of the fact that stream_read will always read 8192 bytes for encryption stream
https://bugs.php.net/bug.php?id=21641
|
2012-04-18 20:54:28 +02:00 |
|
Robin Appelman
|
26e9a0dd13
|
bugfixes for encryption library and test cases
|
2012-04-18 20:54:28 +02:00 |
|
Georg Ehrke
|
b44bc9f4b2
|
remove require once lib base in some more files
|
2012-04-18 17:42:11 +02:00 |
|
Georg Ehrke
|
45de7ad221
|
move files to app folder
|
2012-04-18 17:27:34 +02:00 |
|
Georg Ehrke
|
eb29c577c2
|
Merge branch 'master' into movable_apps
|
2012-04-18 12:20:09 +02:00 |
|
Georg Ehrke
|
cf492a9649
|
Merge branch 'master' into calendar_sharing
|
2012-04-18 11:51:59 +02:00 |
|
Georg Ehrke
|
de71842888
|
implement shared calendar activation on server side
|
2012-04-18 11:50:12 +02:00 |
|
Georg Ehrke
|
8959e0af3d
|
implement shared calendar activation on js-side
|
2012-04-18 11:39:00 +02:00 |
|
Georg Ehrke
|
7402543d3e
|
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
|
2012-04-18 09:53:54 +02:00 |
|
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
|
Robin Appelman
|
4dabd0fb9c
|
test data for archives
|
2012-04-17 18:04:06 +02:00 |
Arthur Schiwon
|
66018b89b2
|
LDAP: don't forget to unbind
|
2012-04-16 18:03:02 +02:00 |
|
Arthur Schiwon
|
86192c2f8d
|
checked, works for me
|
2012-04-16 17:31:39 +02:00 |
|
Arthur Schiwon
|
9cd5221d47
|
group ldap: check configuration
|
2012-04-16 17:28:58 +02:00 |
|
Arthur Schiwon
|
ed54de1bbf
|
group LDAP: implement groupExists function, needed for Sharing
|
2012-04-16 16:23:00 +02:00 |
|
Arthur Schiwon
|
320fde9eec
|
OC_Group does expect object, not string
|
2012-04-16 15:09:38 +02:00 |
|
Arthur Schiwon
|
899c7631d5
|
minor code beautification
|
2012-04-16 15:09:38 +02:00 |
|
Arthur Schiwon
|
e1948c651b
|
use the right attribute for member retrieval
|
2012-04-16 15:09:38 +02:00 |
|
Arthur Schiwon
|
02f4e78f3e
|
a string be a string
|
2012-04-16 15:09:38 +02:00 |
Jan-Christoph Borchardt
|
70d0103a67
|
updated logos and icons
|
2012-04-16 11:34:16 +02:00 |
|
Georg Ehrke
|
dc18e65b46
|
fix merge conflicts
|
2012-04-15 22:26:55 +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 |
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 |
|
Robin Appelman
|
9ac65c51f5
|
dont try to view psd files
|
2012-04-15 16:26:08 +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 |
|
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 |
|
Tom Needham
|
9ee3eb1412
|
remove unused css
|
2012-04-15 13:44:43 +00: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 |
|
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 |
|
Georg Ehrke
|
8ddea7e95c
|
Merge branch 'master' into calendar_sharing
|
2012-04-15 14:28:31 +02:00 |
|
Jan-Christoph Borchardt
|
7ddd043427
|
renamed extention to extension, also now only showing lowercase
|
2012-04-15 13:34:30 +02:00 |
|
Georg Ehrke
|
e292b1fcdb
|
fix merge conflicts
|
2012-04-15 12:43:07 +02:00 |
Bart Visscher
|
3b71e46cf7
|
Contact: Don't use non core class in appinfo/app.php
|
2012-04-14 18:34:59 +02:00 |
|
Arthur Schiwon
|
29bb5d27e4
|
few pieces of documentation
|
2012-04-14 18:26:51 +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
|
b1bcc60d83
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
|
Robin Appelman
|
926b2b78fe
|
keep version numbers in their own files for faster reading
|
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
|
9b1c881ca8
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-04-14 11:18:25 +00: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
|
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 |
|
Georg Ehrke
|
e256ac8791
|
fix unsharing of events
|
2012-04-13 21:49:24 -04:00 |
|
Georg Ehrke
|
c65adc12d5
|
add chosen script to calendar
|
2012-04-13 21:29:51 -04:00 |
|
Georg Ehrke
|
5d4c546693
|
fix public sharing of calendars
|
2012-04-13 17:36:47 -04:00 |
|
Georg Ehrke
|
ea3499a712
|
fix class name
|
2012-04-13 17:26:34 -04:00 |
|
Georg Ehrke
|
1e0364baa8
|
check permission check in share function
|
2012-04-13 17:16:28 -04:00 |
|
Georg Ehrke
|
afcb0aee40
|
fix merge conflicts
|
2012-04-13 16:40:10 -04:00 |
|
Georg Ehrke
|
02dc343209
|
fix address of public shared calendars
|
2012-04-13 16:26:06 -04:00 |
|
Georg Ehrke
|
854eaff34f
|
hide share tab in shared events
|
2012-04-13 16:20:19 -04: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 |
|
Bart Visscher
|
471e735b0c
|
Calendar: Document active parameter in allCalendars
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
7cf7d5c3dd
|
Calendar: Also set repeat options when editing a non repeating event
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
28e0d64ede
|
Calendar: Fix saving of Categories in an event
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
f9b7ed3a1f
|
Calendar: Implement rescan of Categories
|
2012-04-13 21:13:58 +02:00 |
Thomas Tanghus
|
6aee6dae6b
|
VCategories css is now in styles.css
|
2012-04-13 18:50:40 +02:00 |
|
Thomas Tanghus
|
b654121b50
|
Contacts: Better error reporting.
|
2012-04-13 18:50:40 +02:00 |
|
Robin Appelman
|
6066ea3170
|
only run tests for files_external when asked for explicitly
|
2012-04-13 18:49:50 +02:00 |
|
Robin Appelman
|
8686667b10
|
some idexes for the media player tables
|
2012-04-13 18:49:50 +02:00 |
|
Georg Ehrke
|
df2e788a1c
|
fix calendarid in eventform and validation of calendarid
|
2012-04-12 23:15:19 -04:00 |
|
Georg Ehrke
|
a7908ba76b
|
fix bugs in share class
|
2012-04-12 22:11:48 -04:00 |
|
Bart Visscher
|
e9c1f8b4e6
|
Contacts: No need to sort the categories anymore
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
43ba23430d
|
Contacts: Change "category" to "group" in UI
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
78189e2247
|
Contacts: update category list when the categories change
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
9165b5c28e
|
Use the same category input and management as the contacts app
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
b2011bd0a0
|
Remove unused function getCategoryOptions from OC_Calendar_Object
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
5fa90cd214
|
Contacts: Also initialize org var in updateValuesFromAdd
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
86edc0da31
|
Contacts: add space before parameter
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
fa853102e4
|
Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
This is in preparation of making $categories protected and initialized
with default categories.
|
2012-04-12 23:10:49 +02:00 |
Frank Karlitschek
|
48f99fe661
|
off by default. great tool for developers but confusing for users.
|
2012-04-12 20:23:45 +02:00 |
Deepak Mittal
|
bd262eaac0
|
Fixed OC-261 by modifying js files in apps/media/
|
2012-04-12 17:56:53 +02:00 |
Daniele E. Domenichelli
|
d9aa31fd92
|
Use OC_Helper::serverHost() in openid settings
|
2012-04-12 17:51:17 +02:00 |
|
Robin Appelman
|
8cea656ad7
|
upgrade getid3
|
2012-04-12 15:54:08 +02:00 |